@catladder/cli 0.0.0-main-b9f1a625 → 0.0.0-main-90605e10

package/dist/apps/cli/commands/project/commandMigrateHelm3.js

@@ -84,8 +84,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
                                     return [3 /*break*/, 5];
                                 case 5: return [4 /*yield*/, (0, getProjectConfig_1.getEnvironment)(env, componentName)];
                                 case 6:
-                                    releaseName = (_c.sent()).envVars
-                                        .RELEASE_NAME;
+                                    releaseName = (_c.sent()).fullName;
                                     this.log("helm release name: ".concat(releaseName));
                                     this.log("");
                                     this.log("migrating now... 😼. This may take a moment");

package/dist/apps/cli/commands/project/commandMigrateHelm3.js.map

@@ -1 +1 @@
-{"version":3,"file":"commandMigrateHelm3.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandMigrateHelm3.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAA6C;AAE7C,wEAG6C;AAC7C,6CAAiD;AAEjD,2DAA2D;AAE3D;;;GAGG;AACH,sBAAe,UAAO,MAAc;;;;;gBAClC,KAAA,CAAA,KAAA,MAAM;qBACH,OAAO,CACN,sCAAsC,EACtC,6CAA6C,CAC9C,CAAA;qBACA,YAAY,CAAA;gBACV,qBAAM,IAAA,kCAAgB,GAAE,EAAA;oBAN7B,sBAAA,cAMI,CAAC,SAAwB,CAAC,CAAC,MAAM,CAC/B,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAjD,CAAiD,CACzD,EACF;qBACA,MAAM,CAAC,UAAgB,EAAgB;wBAAd,YAAY,kBAAA;;;;;;;oCAE5B,KAAyB,IAAA,8BAAW,EAAC,YAAY,CAAC,EAAhD,GAAG,SAAA,EAAE,aAAa,mBAAA,CAA+B;oCAC1C,qBAAM,IAAA,4BAAI,EAAC,sBAAsB,CAAC,EAAA;;oCAA3C,MAAM,GAAG,SAAkC;oCAC3C,OAAO,GAAG,MAAM,CAAC,MAAgB,CAAC;oCACxC,IAAI,CAAC,GAAG,CAAC,6BAAsB,OAAO,CAAE,CAAC,CAAC;oCAC1C,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;wCAC7B,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC;qCAC7B;;;;oCAEC,qBAAM,IAAA,4BAAI,EACR,2DAA2D,CAC5D,EAAA;;oCAFD,SAEC,CAAC;oCACF,IAAI,CAAC,GAAG,CACN,qEAAqE,CACtE,CAAC;;;;;wCAKiB,qBAAM,IAAA,iCAAc,EAAC,GAAG,EAAE,aAAa,CAAC,EAAA;;oCAAvD,WAAW,GAAG,CAAC,SAAwC,CAAC,CAAC,OAAO;yCACnE,YAAY;oCACf,IAAI,CAAC,GAAG,CAAC,6BAAsB,WAAW,CAAE,CAAC,CAAC;oCAC9C,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACb,IAAI,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAC;oCACxD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACH,qBAAM,IAAA,4BAAI,EAClB,iDAA0C,WAAW,CAAE,CACxD,EAAA;;oCAFK,CAAC,GAAG,SAET;oCACD,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;;;;oCAEZ,IAAA,cAAQ,EAAC,IAAI,EAAE,GAAC,CAAC,OAAO,CAAC,CAAC;oCAC1B,IAAI,CAAC,GAAG,CAAC,wDAAwD,CAAC,CAAC;oCACnE,IAAI,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;oCACrC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;;;;;;iBAEhB,CAAC,EAAA;;;KAAA,EAAC"}
+{"version":3,"file":"commandMigrateHelm3.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandMigrateHelm3.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAA6C;AAE7C,wEAG6C;AAC7C,6CAAiD;AAEjD,2DAA2D;AAE3D;;;GAGG;AACH,sBAAe,UAAO,MAAc;;;;;gBAClC,KAAA,CAAA,KAAA,MAAM;qBACH,OAAO,CACN,sCAAsC,EACtC,6CAA6C,CAC9C,CAAA;qBACA,YAAY,CAAA;gBACV,qBAAM,IAAA,kCAAgB,GAAE,EAAA;oBAN7B,sBAAA,cAMI,CAAC,SAAwB,CAAC,CAAC,MAAM,CAC/B,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAjD,CAAiD,CACzD,EACF;qBACA,MAAM,CAAC,UAAgB,EAAgB;wBAAd,YAAY,kBAAA;;;;;;;oCAE5B,KAAyB,IAAA,8BAAW,EAAC,YAAY,CAAC,EAAhD,GAAG,SAAA,EAAE,aAAa,mBAAA,CAA+B;oCAC1C,qBAAM,IAAA,4BAAI,EAAC,sBAAsB,CAAC,EAAA;;oCAA3C,MAAM,GAAG,SAAkC;oCAC3C,OAAO,GAAG,MAAM,CAAC,MAAgB,CAAC;oCACxC,IAAI,CAAC,GAAG,CAAC,6BAAsB,OAAO,CAAE,CAAC,CAAC;oCAC1C,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;wCAC7B,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC;qCAC7B;;;;oCAEC,qBAAM,IAAA,4BAAI,EACR,2DAA2D,CAC5D,EAAA;;oCAFD,SAEC,CAAC;oCACF,IAAI,CAAC,GAAG,CACN,qEAAqE,CACtE,CAAC;;;;;wCAMiB,qBAAM,IAAA,iCAAc,EAAC,GAAG,EAAE,aAAa,CAAC,EAAA;;oCAAvD,WAAW,GAAG,CAAC,SAAwC,CAAC,CAAC,QAAQ;oCAEvE,IAAI,CAAC,GAAG,CAAC,6BAAsB,WAAW,CAAE,CAAC,CAAC;oCAC9C,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACb,IAAI,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAC;oCACxD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACH,qBAAM,IAAA,4BAAI,EAClB,iDAA0C,WAAW,CAAE,CACxD,EAAA;;oCAFK,CAAC,GAAG,SAET;oCACD,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;;;;oCAEZ,IAAA,cAAQ,EAAC,IAAI,EAAE,GAAC,CAAC,OAAO,CAAC,CAAC;oCAC1B,IAAI,CAAC,GAAG,CAAC,wDAAwD,CAAC,CAAC;oCACnE,IAAI,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;oCACrC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;;;;;;iBAEhB,CAAC,EAAA;;;KAAA,EAAC"}

package/dist/bundles/catenv/index.js

@@ -39822,68 +39822,12 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-b9f1a625" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-90605e10" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
 
-/***/ 486:
-/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
-
-"use strict";
-
-
-var __assign = this && this.__assign || function () {
-  __assign = Object.assign || function (t) {
-    for (var s, i = 1, n = arguments.length; i < n; i++) {
-      s = arguments[i];
-
-      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-    }
-
-    return t;
-  };
-
-  return __assign.apply(this, arguments);
-};
-
-var __importDefault = this && this.__importDefault || function (mod) {
-  return mod && mod.__esModule ? mod : {
-    "default": mod
-  };
-};
-
-exports.__esModule = true;
-exports.getLabels = void 0;
-
-var slugify_1 = __importDefault(__nccwpck_require__(4035));
-
-var sanitize = function (value) {
-  if (!value) return value; //"The value can only contain lowercase letters, numeric characters, underscores and dashes. The value can be at most 63 characters long. International characters are allowed."
-  // slugify should do the job
-
-  return (0, slugify_1["default"])(value).toLowerCase();
-};
-
-var getLabels = function (context) {
-  var _a, _b, _c;
-
-  var labels = __assign({
-    "customer-name": sanitize(context.fullConfig.customerName),
-    "app-name": sanitize(context.fullConfig.appName),
-    "env-type": sanitize(context.environment.envType),
-    "env-name": sanitize(context.environment.shortName),
-    "build-type": sanitize((_a = context.componentConfig.build) === null || _a === void 0 ? void 0 : _a.type)
-  }, (_c = (_b = context.fullConfig.meta) === null || _b === void 0 ? void 0 : _b.labels) !== null && _c !== void 0 ? _c : {});
-
-  return labels;
-};
-
-exports.getLabels = getLabels;
-
-/***/ }),
-
-/***/ 2041:
+/***/ 740:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
 "use strict";
@@ -40086,14 +40030,12 @@ var __importDefault = this && this.__importDefault || function (mod) {
 };
 
 exports.__esModule = true;
-exports.createContext = exports.getEnvironment = exports.getSecretVarNameForContext = exports.getSecretVarName = void 0;
+exports.getEnvironment = exports.getSecretVarNameForContext = exports.getSecretVarName = void 0;
 
 var lodash_1 = __nccwpck_require__(3255);
 
 var slugify_1 = __importDefault(__nccwpck_require__(4035));
 
-var build_1 = __nccwpck_require__(3760);
-
 var deploy_1 = __nccwpck_require__(223);
 
 var types_1 = __nccwpck_require__(3109);
@@ -40134,7 +40076,7 @@ var getEnvironment = function (config, componentName, env, commitInfo, alreadyVi
   }
 
   return __awaiter(void 0, void 0, void 0, function () {
-    var defaultConfig, envConfig, mergedConfig, envType, basePredefinedVariables, environmentName, environmentSlug, predefinedVariables, host, url, devLocalConfig, port, RELEASE_NAME, componentSlug, envInUrl, domainCanonical, HOST_CANONICAL, url_1, KUBE_APP_NAME_PREFIX, KUBE_APP_NAME, KUBE_NAMESPACE, publicEnvVarsRaw, additionalSecretKeys, secretEnvVarKeys, secretEnvVars, legacyFromComponents, publicEnvVarsRawWithLegasyFromComponents, publicEnvVarsRawSanitized, envVarsRaw, envVars;
+    var defaultConfig, envConfig, mergedConfig, envType, basePredefinedVariables, gitlabEnvironmentName, environmentSlug, predefinedVariables, host, url, fullName, devLocalConfig, port, componentSlug, envInUrl, domainCanonical, HOST_CANONICAL, KUBE_APP_NAME_PREFIX, KUBE_APP_NAME, KUBE_NAMESPACE, publicEnvVarsRaw, additionalSecretKeys, secretEnvVarKeys, secretEnvVars, legacyFromComponents, publicEnvVarsRawWithLegasyFromComponents, publicEnvVarsRawSanitized, envVarsRaw, envVars;
 
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
 
@@ -40165,8 +40107,9 @@ var getEnvironment = function (config, componentName, env, commitInfo, alreadyVi
             APP_DIR: mergedConfig.dir,
             ENV_TYPE: envType
           };
-          environmentName = envType === "review" && commitInfo ? "".concat(env, "/").concat(commitInfo.refName, "/").concat(componentName) : "".concat(env, "/").concat(componentName);
+          gitlabEnvironmentName = envType === "review" && commitInfo ? "".concat(env, "/").concat(commitInfo.refName, "/").concat(componentName) : "".concat(env, "/").concat(componentName);
           environmentSlug = envType === "review" && commitInfo ? "".concat(env, "-").concat(commitInfo.reviewSlug, "-").concat(componentName) : "".concat(env, "-").concat(componentName);
+          fullName = "".concat(config.customerName, "-").concat(config.appName, "-").concat(environmentSlug);
 
           if (envType === "local") {
             devLocalConfig = mergedConfig;
@@ -40179,25 +40122,23 @@ var getEnvironment = function (config, componentName, env, commitInfo, alreadyVi
               PORT: port.toString()
             };
           } else {
-            RELEASE_NAME = "".concat(config.customerName, "-").concat(config.appName, "-").concat(environmentSlug);
             componentSlug = (0, slugify_1["default"])(componentName);
             envInUrl = envType === "review" && commitInfo ? "".concat(commitInfo.reviewSlug, ".").concat(env) : env;
             domainCanonical = (mergedConfig === null || mergedConfig === void 0 ? void 0 : mergedConfig.deploy) && (mergedConfig === null || mergedConfig === void 0 ? void 0 : mergedConfig.deploy.type) === "kubernetes" && ((_e = mergedConfig.deploy.cluster) === null || _e === void 0 ? void 0 : _e.domainCanonical) || // for convenience, we allow clusters to define a canonical domain, because a cluster has a fixed ip and you will usually have a domain pointing to that cluster
             config.domainCanonical || "panter.cloud";
             HOST_CANONICAL = (0, types_1.isOfDeployType)(mergedConfig.deploy, "kubernetes") ? "".concat(componentSlug, ".").concat(envInUrl, ".").concat(config.appName, ".").concat(config.customerName, ".").concat(domainCanonical) : (0, types_1.isOfDeployType)(mergedConfig.deploy, "google-cloudrun") ? environmentSlug + "-" + process.env[(0, exports.getSecretVarName)(env, componentName, deploy_1.GCLOUD_RUN_CANONICAL_HOST_SUFFIX)] : "";
             host = (_f = mergedConfig === null || mergedConfig === void 0 ? void 0 : mergedConfig.host) !== null && _f !== void 0 ? _f : HOST_CANONICAL;
-            url_1 = "https://".concat(host);
+            url = "https://".concat(host);
             KUBE_APP_NAME_PREFIX = envType === "review" && commitInfo ? "".concat(commitInfo.reviewSlug, "-") : "";
             KUBE_APP_NAME = "".concat(KUBE_APP_NAME_PREFIX).concat(componentName);
             KUBE_NAMESPACE = (0, deploy_1.getKubernetesNamespace)(config, env);
             predefinedVariables = __assign(__assign({}, basePredefinedVariables), {
               HOST_CANONICAL: HOST_CANONICAL,
               HOST: host,
-              ROOT_URL: url_1,
+              ROOT_URL: url,
               KUBE_NAMESPACE: KUBE_NAMESPACE,
               KUBE_APP_NAME: KUBE_APP_NAME,
-              KUBE_APP_NAME_PREFIX: KUBE_APP_NAME_PREFIX,
-              RELEASE_NAME: RELEASE_NAME
+              KUBE_APP_NAME_PREFIX: KUBE_APP_NAME_PREFIX
             });
           }
 
@@ -40247,10 +40188,14 @@ var getEnvironment = function (config, componentName, env, commitInfo, alreadyVi
           , {
             envType: envType,
             host: host,
-            fullName: environmentName,
+            url: url,
+            gitlabEnvironment: {
+              name: gitlabEnvironmentName,
+              url: url
+            },
+            fullName: fullName,
             slug: environmentSlug,
             shortName: env,
-            url: predefinedVariables.ROOT_URL,
             envVars: envVars,
             secretEnvVarKeys: secretEnvVarKeys
           }];
@@ -40261,6 +40206,241 @@ var getEnvironment = function (config, componentName, env, commitInfo, alreadyVi
 
 exports.getEnvironment = getEnvironment;
 
+/***/ }),
+
+/***/ 486:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+
+var __assign = this && this.__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+
+      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+    }
+
+    return t;
+  };
+
+  return __assign.apply(this, arguments);
+};
+
+var __importDefault = this && this.__importDefault || function (mod) {
+  return mod && mod.__esModule ? mod : {
+    "default": mod
+  };
+};
+
+exports.__esModule = true;
+exports.getLabels = void 0;
+
+var slugify_1 = __importDefault(__nccwpck_require__(4035));
+
+var sanitize = function (value) {
+  if (!value) return value; //"The value can only contain lowercase letters, numeric characters, underscores and dashes. The value can be at most 63 characters long. International characters are allowed."
+  // slugify should do the job
+
+  return (0, slugify_1["default"])(value).toLowerCase();
+};
+
+var getLabels = function (context) {
+  var _a, _b, _c;
+
+  var labels = __assign({
+    "customer-name": sanitize(context.fullConfig.customerName),
+    "app-name": sanitize(context.fullConfig.appName),
+    "env-type": sanitize(context.environment.envType),
+    "env-name": sanitize(context.environment.shortName),
+    "build-type": sanitize((_a = context.componentConfig.build) === null || _a === void 0 ? void 0 : _a.type)
+  }, (_c = (_b = context.fullConfig.meta) === null || _b === void 0 ? void 0 : _b.labels) !== null && _c !== void 0 ? _c : {});
+
+  return labels;
+};
+
+exports.getLabels = getLabels;
+
+/***/ }),
+
+/***/ 2041:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+
+var __createBinding = this && this.__createBinding || (Object.create ? function (o, m, k, k2) {
+  if (k2 === undefined) k2 = k;
+  Object.defineProperty(o, k2, {
+    enumerable: true,
+    get: function () {
+      return m[k];
+    }
+  });
+} : function (o, m, k, k2) {
+  if (k2 === undefined) k2 = k;
+  o[k2] = m[k];
+});
+
+var __exportStar = this && this.__exportStar || function (m, exports) {
+  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+
+var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, generator) {
+  function adopt(value) {
+    return value instanceof P ? value : new P(function (resolve) {
+      resolve(value);
+    });
+  }
+
+  return new (P || (P = Promise))(function (resolve, reject) {
+    function fulfilled(value) {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+
+    function rejected(value) {
+      try {
+        step(generator["throw"](value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+
+    function step(result) {
+      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+    }
+
+    step((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
+};
+
+var __generator = this && this.__generator || function (thisArg, body) {
+  var _ = {
+    label: 0,
+    sent: function () {
+      if (t[0] & 1) throw t[1];
+      return t[1];
+    },
+    trys: [],
+    ops: []
+  },
+      f,
+      y,
+      t,
+      g;
+  return g = {
+    next: verb(0),
+    "throw": verb(1),
+    "return": verb(2)
+  }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
+    return this;
+  }), g;
+
+  function verb(n) {
+    return function (v) {
+      return step([n, v]);
+    };
+  }
+
+  function step(op) {
+    if (f) throw new TypeError("Generator is already executing.");
+
+    while (_) try {
+      if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+      if (y = 0, t) op = [op[0] & 2, t.value];
+
+      switch (op[0]) {
+        case 0:
+        case 1:
+          t = op;
+          break;
+
+        case 4:
+          _.label++;
+          return {
+            value: op[1],
+            done: false
+          };
+
+        case 5:
+          _.label++;
+          y = op[1];
+          op = [0];
+          continue;
+
+        case 7:
+          op = _.ops.pop();
+
+          _.trys.pop();
+
+          continue;
+
+        default:
+          if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+            _ = 0;
+            continue;
+          }
+
+          if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+            _.label = op[1];
+            break;
+          }
+
+          if (op[0] === 6 && _.label < t[1]) {
+            _.label = t[1];
+            t = op;
+            break;
+          }
+
+          if (t && _.label < t[2]) {
+            _.label = t[2];
+
+            _.ops.push(op);
+
+            break;
+          }
+
+          if (t[2]) _.ops.pop();
+
+          _.trys.pop();
+
+          continue;
+      }
+
+      op = body.call(thisArg, _);
+    } catch (e) {
+      op = [6, e];
+      y = 0;
+    } finally {
+      f = t = 0;
+    }
+
+    if (op[0] & 5) throw op[1];
+    return {
+      value: op[0] ? op[1] : void 0,
+      done: true
+    };
+  }
+};
+
+exports.__esModule = true;
+exports.createContext = void 0;
+
+var build_1 = __nccwpck_require__(3760);
+
+var deploy_1 = __nccwpck_require__(223);
+
+var utils_1 = __nccwpck_require__(7461);
+
+var getEnvironment_1 = __nccwpck_require__(740);
+
+__exportStar(__nccwpck_require__(740), exports);
+
 var createContext = function (config, componentName, env, commitInfo, packageManagerInfo) {
   return __awaiter(void 0, void 0, void 0, function () {
     var rawConfig, envConfig, componentConfigWithoutDefaults, defaults, componentConfig;
@@ -40299,7 +40479,7 @@ var createContext = function (config, componentName, env, commitInfo, packageMan
           };
           return [4
           /*yield*/
-          , (0, exports.getEnvironment)(config, componentName, env, commitInfo)];
+          , (0, getEnvironment_1.getEnvironment)(config, componentName, env, commitInfo)];
 
         case 1:
           return [2
@@ -40718,14 +40898,9 @@ var DEPLOY_RUNNER_VARIABLES = {
 var getBaseDeploymentJob = function (context) {
   var _a, _b, _c;
 
-  var environment = {
-    name: context.environment.fullName,
-    url: context.environment.url
-  };
   var hasDocker = (0, docker_1.requiresDockerBuild)(context);
   var isStoppable = (0, utils_1.contextIsStoppable)(context);
-  var autoStop = context.environment.envType === "review" ? "3 days" // auto stop is not working properly when branch is merged, so we do
-  : context.environment.envType === "dev" ? "3 weeks" : undefined; // if auto or manual is configured explicitly, use that
+  var autoStop = context.environment.envType === "review" ? "2 week" : context.environment.envType === "dev" ? "4 weeks" : undefined; // if auto or manual is configured explicitly, use that
 
   var whenDeployDefined = context.componentConfig.deploy && context.componentConfig.deploy.when ? context.componentConfig.deploy.when : undefined; // otherwise auto deploy if env is not prod. If its prod, deploy automatically if stage is disabled
 
@@ -40760,7 +40935,7 @@ var getBaseDeploymentJob = function (context) {
     allow_failure: whenDeploy === "manual" ? true : false,
     stage: "deploy",
     variables: __assign(__assign(__assign({}, DEPLOY_RUNNER_VARIABLES), context.environment.envVars), hasDocker ? (0, docker_1.getDockerImageVariables)(context) : {}),
-    environment: __assign(__assign({}, environment), isStoppable ? {
+    environment: __assign(__assign({}, context.environment.gitlabEnvironment), isStoppable ? {
       on_stop: exports.STOP_JOB_NAME,
       auto_stop_in: autoStop
     } : {})
@@ -40770,10 +40945,6 @@ var getBaseDeploymentJob = function (context) {
 exports.getBaseDeploymentJob = getBaseDeploymentJob;
 
 var getBaseDeploymentStopJob = function (context) {
-  var environment = {
-    name: context.environment.fullName,
-    url: context.environment.url
-  };
   return {
     name: exports.STOP_JOB_NAME,
     envMode: "stagePerEnv",
@@ -40790,7 +40961,7 @@ var getBaseDeploymentStopJob = function (context) {
       GIT_STRATEGY: "none"
     }),
     stage: "stop",
-    environment: __assign(__assign({}, environment), {
+    environment: __assign(__assign({}, context.environment.gitlabEnvironment), {
       action: "stop"
     })
   };
@@ -40799,10 +40970,6 @@ var getBaseDeploymentStopJob = function (context) {
 exports.getBaseDeploymentStopJob = getBaseDeploymentStopJob;
 
 var getBaseRollbackJob = function (context) {
-  var environment = {
-    name: context.environment.fullName,
-    url: context.environment.url
-  };
   return {
     name: exports.ROLLBACK_JOB_NAME,
     envMode: "stagePerEnv",
@@ -40815,7 +40982,7 @@ var getBaseRollbackJob = function (context) {
       GIT_STRATEGY: "none"
     }),
     stage: "rollback",
-    environment: __assign(__assign({}, environment), {
+    environment: __assign(__assign({}, context.environment.gitlabEnvironment), {
       action: "access"
     })
   };
@@ -40907,7 +41074,7 @@ var createDeployJob = function (context) {
   var pushImageToArtifactsRegistry = __spreadArray(__spreadArray([docker_1.gitlabDockerLogin], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), ["gcloud auth configure-docker ".concat(deployConfig.region, "-docker.pkg.dev"), "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG", "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG ".concat(gcloudImageName), "docker push ".concat(gcloudImageName)], false);
 
   var allEnvVars = (0, lodash_1.omit)(context.environment.envVars, _1.GCLOUD_DEPLOY_CREDENTIALS_KEY);
-  var serviceName = context.environment.slug;
+  var serviceName = context.environment.fullName;
   var labelsString = Object.entries((0, getLabels_1.getLabels)(context)).map(function (_a) {
     var _b = __read(_a, 2),
         key = _b[0],
@@ -41389,6 +41556,7 @@ var createKubernetesDeployJobs = function (context) {
   var shared = {
     image: (0, runner_1.getRunnerImage)("kubernetes"),
     variables: __assign(__assign({}, context.environment.envVars), {
+      RELEASE_NAME: context.environment.fullName,
       HELM_EXPERIMENTAL_OCI: "1",
       KUBE_DOCKER_IMAGE_PULL_SECRET: "gitlab-registry-".concat(context.componentName),
       KUBE_VALUES: (0, js_yaml_1.dump)(kubeValues, {