@catladder/pipeline 0.0.0-node16-ddfae617 → 0.0.0-rolling-update-3bca086c

package/dist/build/docker.d.ts

@@ -1,7 +1,21 @@
 import { Context } from "../types";
 import { CatladderJob } from "../types/jobs";
+export declare const getDockerImageVariables: (context: Context) => {
+  DOCKER_REGISTRY: string;
+  DOCKER_REGISTRY_IMAGE_PATH: string;
+  DOCKER_CACHE_IMAGE: string;
+  DOCKER_IMAGE_NAME: string;
+  DOCKER_IMAGE: string;
+  DOCKER_IMAGE_TAG: string;
+};
 export declare const requiresDockerBuild: (context: Context) => boolean;
 export declare const getDockerBuildVariables: (context: Context) => {
+  DOCKER_REGISTRY: string;
+  DOCKER_REGISTRY_IMAGE_PATH: string;
+  DOCKER_CACHE_IMAGE: string;
+  DOCKER_IMAGE_NAME: string;
+  DOCKER_IMAGE: string;
+  DOCKER_IMAGE_TAG: string;
   DOCKER_BUILDKIT: string;
   DOCKERFILE_ADDITIONS: string | undefined;
   DOCKERFILE_ADDITIONS_END: string | undefined;
@@ -9,10 +23,7 @@ export declare const getDockerBuildVariables: (context: Context) => {
   DOCKER_HOST: string;
   DOCKER_TLS_CERTDIR: string;
   DOCKER_DIR: string;
-  IMAGE_TAG: string;
   DOCKER_DRIVER: string;
-  IMAGE_NAME: string;
-  CACHE_IMAGE: string;
   KUBERNETES_CPU_REQUEST: string;
   KUBERNETES_CPU_LIMIT: string;
   KUBERNETES_MEMORY_REQUEST: string;

package/dist/build/docker.js

@@ -61,7 +61,7 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
 };
 
 exports.__esModule = true;
-exports.createDockerBuildJobDefault = exports.createDockerBuildJobBase = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = void 0;
+exports.createDockerBuildJobDefault = exports.createDockerBuildJobBase = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = exports.getDockerImageVariables = void 0;
 
 var lodash_1 = require("lodash");
 
@@ -76,6 +76,19 @@ var DOCKER_RUNNER_BUILD_VARIABLES = {
   KUBERNETES_MEMORY_LIMIT: "2Gi"
 };
 
+var getDockerImageVariables = function (context) {
+  return {
+    DOCKER_REGISTRY: "$CI_REGISTRY",
+    DOCKER_REGISTRY_IMAGE_PATH: "$CI_REGISTRY_IMAGE",
+    DOCKER_CACHE_IMAGE: "$DOCKER_REGISTRY_IMAGE_PATH/caches/" + context.componentName,
+    DOCKER_IMAGE_NAME: context.environment.shortName + "/" + context.componentName,
+    DOCKER_IMAGE: "$DOCKER_REGISTRY_IMAGE_PATH/$DOCKER_IMAGE_NAME",
+    DOCKER_IMAGE_TAG: "$CI_COMMIT_SHA"
+  };
+};
+
+exports.getDockerImageVariables = getDockerImageVariables;
+
 var requiresDockerBuild = function (context) {
   var deployConfig = context.componentConfig.deploy;
 
@@ -95,7 +108,7 @@ exports.requiresDockerBuild = requiresDockerBuild;
 var getDockerBuildVariables = function (context) {
   var _a, _b, _c, _d;
 
-  return __assign(__assign({}, DOCKER_RUNNER_BUILD_VARIABLES), {
+  return __assign(__assign(__assign({}, DOCKER_RUNNER_BUILD_VARIABLES), {
     DOCKER_BUILDKIT: "1",
     DOCKERFILE_ADDITIONS: (_b = (_a = context.componentConfig.build.docker) === null || _a === void 0 ? void 0 : _a.additionsBegin) === null || _b === void 0 ? void 0 : _b.join("\n"),
     DOCKERFILE_ADDITIONS_END: (_d = (_c = context.componentConfig.build.docker) === null || _c === void 0 ? void 0 : _c.additionsEnd) === null || _d === void 0 ? void 0 : _d.join("\n"),
@@ -103,11 +116,8 @@ var getDockerBuildVariables = function (context) {
     DOCKER_HOST: "tcp://0.0.0.0:2375",
     DOCKER_TLS_CERTDIR: "",
     DOCKER_DIR: ".",
-    IMAGE_TAG: "$CI_COMMIT_SHA",
-    DOCKER_DRIVER: "overlay2",
-    IMAGE_NAME: "$CI_REGISTRY_IMAGE/" + context.environment.shortName + "/" + context.componentName,
-    CACHE_IMAGE: "$CI_REGISTRY_IMAGE/caches/" + context.componentName
-  });
+    DOCKER_DRIVER: "overlay2"
+  }), (0, exports.getDockerImageVariables)(context));
 };
 
 exports.getDockerBuildVariables = getDockerBuildVariables;
@@ -139,7 +149,7 @@ var createDockerBuildJobDefault = function (context, _a) {
       def = __rest(_a, ["script"]);
 
   return (0, exports.createDockerBuildJobBase)(context, __assign({
-    script: __spreadArray(__spreadArray([], __read(script || []), false), ["docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY", "docker build --network host --cache-from $CACHE_IMAGE --tag $IMAGE_NAME:$IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1", "docker push $IMAGE_NAME:$IMAGE_TAG", "docker tag $IMAGE_NAME:$IMAGE_TAG $CACHE_IMAGE", "docker push $CACHE_IMAGE"], false)
+    script: __spreadArray(__spreadArray([], __read(script || []), false), ["docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY", "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1", "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG", "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE", "docker push $DOCKER_CACHE_IMAGE"], false)
   }, def));
 };
 

package/dist/build/node/testJob.js

@@ -52,6 +52,8 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
 exports.__esModule = true;
 exports.createNodeTestJobs = void 0;
 
+var runner_1 = require("../../runner");
+
 var utils_1 = require("../../utils");
 
 var cache_1 = require("./cache");
@@ -95,6 +97,7 @@ var createNodeTestJobs = function (context) {
   var testJob = buildConfig.test !== false ? __assign(__assign({
     name: "🧪 test"
   }, base), {
+    image: (0, runner_1.getRunnerImage)("jobs-testing-chrome"),
     cache: (0, cache_1.getNodeCache)(context),
     script: __spreadArray(__spreadArray(["cd ".concat(context.componentConfig.dir)], __read(yarnInstall), false), __read((_j = (0, utils_1.ensureArray)((_h = buildConfig.test) === null || _h === void 0 ? void 0 : _h.command)) !== null && _j !== void 0 ? _j : ["yarn test"]), false)
   }) : null;

package/dist/constants.js

@@ -2,5 +2,5 @@
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "node16-ddfae617" || "";
+exports.PIPELINE_IMAGE_TAG = "rolling-update-3bca086c" || "";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "";

package/dist/context/index.js

@@ -73,6 +73,12 @@ var getSecretVarName = function (env, componentName, key) {
 
 exports.getSecretVarName = getSecretVarName;
 
+var addIndexVar = function (vars) {
+  return __assign(__assign({}, vars), {
+    _ALL_ENV_VAR_KEYS: JSON.stringify(Object.keys(vars))
+  });
+};
+
 var getSecretVarNameForContext = function (context, key) {
   return (0, exports.getSecretVarName)(context.environment.shortName, context.componentName, key);
 };
@@ -143,6 +149,7 @@ var getEnvironment = function (config, componentName, env, commitInfo, alreadyVi
     var KUBE_NAMESPACE = (0, deploy_1.getKubernetesNamespace)(config, env);
     predefinedVariables = __assign(__assign({}, basePredefinedVariables), {
       HOST_CANONICAL: HOST_CANONICAL,
+      HOST: host,
       ROOT_URL: url_1,
       KUBE_NAMESPACE: KUBE_NAMESPACE,
       KUBE_APP_NAME: KUBE_APP_NAME,
@@ -165,9 +172,7 @@ var getEnvironment = function (config, componentName, env, commitInfo, alreadyVi
 
     return [key, (0, lodash_1.isObject)(value) ? JSON.stringify(value) : "".concat(value)];
   }));
-
-  var envVarsRaw = __assign(__assign(__assign({}, predefinedVariables), secretEnvVars), publicEnvVarsRawSanitized);
-
+  var envVarsRaw = addIndexVar(__assign(__assign(__assign({}, predefinedVariables), secretEnvVars), publicEnvVarsRawSanitized));
   var envVars = (0, resolveReferences_1.resolveReferences)(envVarsRaw, function (componentName, variableName, alreadyVisited) {
     var envVars = (0, exports.getEnvironment)(config, componentName, env, commitInfo, alreadyVisited).envVars;
     return envVars[variableName];

package/dist/deploy/base.d.ts

@@ -2,7 +2,9 @@ import { Context } from "../types";
 import { CatladderJob } from "../types/jobs";
 export declare const DEPLOY_JOB_NAME = "\uD83D\uDE80 Deploy";
 export declare const STOP_JOB_NAME = "\uD83D\uDED1 Stop \u26A0\uFE0F";
+export declare const ROLLBACK_JOB_NAME = "\u21A9\uFE0F Rollback \u26A0\uFE0F";
 declare type JobWithoutScript = Omit<CatladderJob, "script">;
 export declare const getBaseDeploymentJob: (context: Context) => JobWithoutScript;
 export declare const getBaseDeploymentStopJob: (context: Context) => JobWithoutScript;
+export declare const getBaseRollbackJob: (context: Context) => JobWithoutScript;
 export {};

package/dist/deploy/base.js

@@ -15,7 +15,7 @@ var __assign = this && this.__assign || function () {
 };
 
 exports.__esModule = true;
-exports.getBaseDeploymentStopJob = exports.getBaseDeploymentJob = exports.STOP_JOB_NAME = exports.DEPLOY_JOB_NAME = void 0;
+exports.getBaseRollbackJob = exports.getBaseDeploymentStopJob = exports.getBaseDeploymentJob = exports.ROLLBACK_JOB_NAME = exports.STOP_JOB_NAME = exports.DEPLOY_JOB_NAME = void 0;
 
 var docker_1 = require("../build/docker");
 
@@ -23,6 +23,7 @@ var utils_1 = require("./utils");
 
 exports.DEPLOY_JOB_NAME = "🚀 Deploy";
 exports.STOP_JOB_NAME = "🛑 Stop ⚠️";
+exports.ROLLBACK_JOB_NAME = "↩️ Rollback ⚠️";
 var DEPLOY_RUNNER_VARIABLES = {
   KUBERNETES_CPU_REQUEST: "0.5",
   KUBERNETES_CPU_LIMIT: "1",
@@ -31,7 +32,7 @@ var DEPLOY_RUNNER_VARIABLES = {
 };
 
 var getBaseDeploymentJob = function (context) {
-  var _a;
+  var _a, _b, _c;
 
   var environment = {
     name: context.environment.fullName,
@@ -52,6 +53,13 @@ var getBaseDeploymentJob = function (context) {
   return {
     name: exports.DEPLOY_JOB_NAME,
     envMode: "stagePerEnv",
+    needsOtherComponent: context.componentConfig.deploy ? (_c = (_b = context.componentConfig.deploy.waitFor) === null || _b === void 0 ? void 0 : _b.map(function (c) {
+      return {
+        componentName: c,
+        job: exports.DEPLOY_JOB_NAME,
+        artifacts: false
+      };
+    })) !== null && _c !== void 0 ? _c : undefined : undefined,
     // we don't want to deploy when there is a broken test
     needsStages: [{
       stage: "build",
@@ -67,7 +75,7 @@ var getBaseDeploymentJob = function (context) {
     }],
     allow_failure: whenDeploy === "manual" ? true : false,
     stage: "deploy",
-    variables: __assign(__assign({}, DEPLOY_RUNNER_VARIABLES), context.environment.envVars),
+    variables: __assign(__assign(__assign({}, DEPLOY_RUNNER_VARIABLES), context.environment.envVars), hasDocker ? (0, docker_1.getDockerImageVariables)(context) : {}),
     environment: __assign(__assign({}, environment), isStoppable ? {
       on_stop: exports.STOP_JOB_NAME,
       auto_stop_in: autoStop
@@ -104,4 +112,29 @@ var getBaseDeploymentStopJob = function (context) {
   };
 };
 
-exports.getBaseDeploymentStopJob = getBaseDeploymentStopJob;
+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",
+    needs: [exports.DEPLOY_JOB_NAME],
+    rules: [{
+      when: "manual",
+      allow_failure: true
+    }],
+    variables: __assign(__assign({}, DEPLOY_RUNNER_VARIABLES), {
+      GIT_STRATEGY: "none"
+    }),
+    stage: "rollback",
+    environment: __assign(__assign({}, environment), {
+      action: "access"
+    })
+  };
+};
+
+exports.getBaseRollbackJob = getBaseRollbackJob;

package/dist/deploy/kubernetes/deployJob.js

@@ -145,7 +145,7 @@ var createKubernetesDeployJobs = function (context) {
     image: (0, runner_1.getRunnerImage)("kubernetes"),
     variables: __assign(__assign({}, context.environment.envVars), {
       HELM_EXPERIMENTAL_OCI: "1",
-      IMAGE_PULL_SECRET: "gitlab-registry-".concat(context.componentName),
+      KUBE_DOCKER_IMAGE_PULL_SECRET: "gitlab-registry-".concat(context.componentName),
       KUBE_VALUES: (0, js_yaml_1.dump)(kubeValues, {
         lineWidth: -1,
         quotingType: "'",
@@ -154,14 +154,12 @@ var createKubernetesDeployJobs = function (context) {
       HELM_GITLAB_CHART_NAME: "the-panter-chart",
       HELM_ARGS: __spreadArray(__spreadArray([], __read(deployConfig.debug ? ["--debug"] : []), false), __read((_p = deployConfig.additionalHelmArgs) !== null && _p !== void 0 ? _p : []), false).join(" "),
       COMPONENT_NAME: context.componentName,
-      BUILD_ID: (_q = context.commitInfo) === null || _q === void 0 ? void 0 : _q.buildId,
-      // TODO: unify with docker build stage
-      IMAGE_NAME: context.environment.shortName + "/" + context.componentName,
-      IMAGE_TAG: "$CI_COMMIT_SHA"
+      BUILD_ID: (_q = context.commitInfo) === null || _q === void 0 ? void 0 : _q.buildId
     })
   };
   var baseDeploymentJob = (0, base_1.getBaseDeploymentJob)(context);
   var baseStopJob = (0, base_1.getBaseDeploymentStopJob)(context);
+  var baseRollbackJob = (0, base_1.getBaseRollbackJob)(context);
   var clusterName = "kube-".concat(context.environment.fullName);
   var connectContext = ["kubectl config set-cluster \"".concat(clusterName, "\" --server=\"$").concat((0, __1.getSecretVarNameForContext)(context, "KUBE_URL"), "\" --certificate-authority <(echo $").concat((0, __1.getSecretVarNameForContext)(context, "KUBE_CA_PEM"), " | base64 -d) --embed-certs=true"), "kubectl config set-credentials \"".concat(clusterName, "\" --token=\"$").concat((0, __1.getSecretVarNameForContext)(context, "KUBE_TOKEN"), "\""), "kubectl config set-context \"".concat(clusterName, "\" --cluster=\"").concat(clusterName, "\" --user=\"").concat(clusterName, "\" --namespace=\"").concat(context.environment.envVars.KUBE_NAMESPACE, "\""), "kubectl config use-context \"".concat(clusterName, "\"")];
   return [(0, lodash_1.merge)({}, baseDeploymentJob, shared, {
@@ -174,6 +172,11 @@ var createKubernetesDeployJobs = function (context) {
     environment: {
       kubernetes: kubernetesEnvironment
     }
+  }), (0, lodash_1.merge)({}, baseRollbackJob, shared, {
+    script: __spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesRollback"], false),
+    environment: {
+      kubernetes: kubernetesEnvironment
+    }
   })];
 };
 

package/dist/deploy/kubernetes/processSecretsAsFiles.d.ts

@@ -27,18 +27,11 @@ export declare const processSecretsAsFiles: <T extends {
     redirects?: ({
       host: string;
     } & Record<string, unknown>)[] | undefined;
+    hostAliases?: string[] | undefined;
     replicas?: number | undefined;
     autoscale?: import("../types").KubernetesAutoscale | undefined;
-    resources?: {
-      limits?: {
-        cpu?: string | undefined;
-        memory?: string | undefined;
-      } | undefined;
-      requests?: {
-        cpu?: string | undefined;
-        memory?: string | undefined;
-      } | undefined;
-    } | undefined;
+    updateStrategy?: import("../types").KubernetesUpdateStrategy | undefined;
+    resources?: import("../types").KubernetesResourcesDef | undefined;
     healthRoute?: string | undefined;
     startupProbe?: {
       httpGet?: {
@@ -82,6 +75,7 @@ export declare const processSecretsAsFiles: <T extends {
         successThreshold?: number | undefined;
       } | undefined;
     } | undefined;
+    worker?: import("../types").KubernetesWorkerDef | undefined;
   } & Record<string, unknown>) | undefined;
   secretsAsFile?: string[] | undefined;
 } & Record<string, unknown>>(values: T) => T;

package/dist/deploy/types.d.ts

@@ -5,6 +5,12 @@ export declare type DeployConfigBase = {
    * - all other envs: auto
    */
   when?: "manual" | "auto";
+  /**
+   * EXPERIMENTAL
+   * wait for other components to deploy first, before doing this deployment
+   */
+
+  waitFor?: string[];
 };
 declare type AllowUnknownProps<T extends Record<string, unknown>> = T & Record<string, unknown>;
 export declare type DeployConfigKubernetesClusterGCloud = {
@@ -54,6 +60,16 @@ export declare type KubernetesAutoscale = {
 
   metrics: KubernetesAutoscaleMetric[];
 };
+export declare type KubernetesResourcesDef = {
+  limits?: {
+    cpu?: string;
+    memory?: string;
+  };
+  requests?: {
+    cpu?: string;
+    memory?: string;
+  };
+};
 declare type KubernetesHealthDef = {
   httpGet?: {
     path?: string;
@@ -68,6 +84,33 @@ declare type KubernetesHealthDef = {
     successThreshold?: number;
   };
 };
+export declare type KubernetesUpdateStrategy = {
+  rollingUpdate: {
+    /**
+     * how many pods can be created additionally to the target number
+     * can be absolute number or percentage.
+     * defaults to 1 (kube default is 25%)
+     */
+    maxSurge: number | string;
+    /**
+     * how many pods are allowed to be unavailable
+     * can be absolute number or percentage
+     * defaults to 0 (kube default is 25%)
+     */
+
+    maxUnavailable: number | string;
+  };
+  type: "RollingUpdate";
+};
+export declare type KubernetesWorkerDef = {
+  enabled: boolean;
+  /**
+   * which command to run. defaults to `yarn start`
+   */
+
+  command?: string;
+  resources?: KubernetesResourcesDef;
+};
 export declare type DeployConfigKubernetesValues = AllowUnknownProps<{
   /**
    * enable cloudsql db. Currently you have to manually set it up
@@ -126,6 +169,11 @@ export declare type DeployConfigKubernetesValues = AllowUnknownProps<{
     redirects?: AllowUnknownProps<{
       host: string;
     }>[];
+    /**
+     * Host aliases
+     */
+
+    hostAliases?: string[];
     /**
      * how many pods will be started
      */
@@ -136,24 +184,27 @@ export declare type DeployConfigKubernetesValues = AllowUnknownProps<{
      */
 
     autoscale?: KubernetesAutoscale;
+    /**
+     * the update strategy, see https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#rolling-update-deployment
+     */
+
+    updateStrategy?: KubernetesUpdateStrategy;
     /**
      * kubernetes resources
      */
 
-    resources?: {
-      limits?: {
-        cpu?: string;
-        memory?: string;
-      };
-      requests?: {
-        cpu?: string;
-        memory?: string;
-      };
-    };
+    resources?: KubernetesResourcesDef;
     healthRoute?: string;
     startupProbe?: KubernetesHealthDef;
     readinessProbe?: KubernetesHealthDef;
     livenessProbe?: KubernetesHealthDef;
+    /**
+     * specify a worker. A worker is a separate deployment that runs continously in the background.
+     * The worker pod can use the same entry point as the app or a different one (specify command).
+     * It has the same environment variables as the application and an additional IS_WORKER="true" variable
+     */
+
+    worker?: KubernetesWorkerDef;
   }>;
   /**
    * Mount secrets as files in the filesystem.
@@ -181,7 +232,7 @@ export declare type DeployConfigKubernetes = {
 
   values?: DeployConfigKubernetesValues;
 } & DeployConfigBase;
-declare type DeployConfigCustom = {
+export declare type DeployConfigCustom = {
   type: "custom";
   requiresDocker: boolean;
   script: string[];

package/dist/pipeline/createChildPipeline.js

@@ -199,9 +199,9 @@ var rules_1 = require("../rules");
 
 var runner_1 = require("../runner");
 
-var createJobs_1 = require("./createJobs");
+var jobs_1 = require("../types/jobs");
 
-var baseStages = ["setup", "test", "build", "deploy", "verify", "stop"];
+var createJobs_1 = require("./createJobs");
 
 var createChildPipeline = function (type, trigger, config) {
   return __awaiter(void 0, void 0, void 0, function () {
@@ -243,7 +243,7 @@ var createChildPipeline = function (type, trigger, config) {
         case 1:
           jobs = _a.sent();
           allEnvs = (0, config_1.getAllEnvsInAllComponents)(config);
-          stages = baseStages.reduce(function (acc, baseStage) {
+          stages = jobs_1.BASE_STAGES.reduce(function (acc, baseStage) {
             return __spreadArray(__spreadArray(__spreadArray([], __read(acc), false), [baseStage], false), __read(allEnvs.map(function (e) {
               return "".concat(baseStage, " ").concat(e);
             })), false);

package/dist/pipeline/createJobs.js

@@ -277,18 +277,28 @@ var getFullReferencedJobName = function (referencedJobName, componentName, env,
 
 
 var replaceReferences = function (job, componentName, env, allRawJobs) {
-  var _a, _b;
+  var _a, _b, _c;
 
   var stage = job.envMode === "stagePerEnv" ? "".concat(job.stage, " ").concat(env) : job.stage;
+  var needsFromNeeds = (_a = job.needs) === null || _a === void 0 ? void 0 : _a.map(function (n) {
+    return (0, lodash_1.isObject)(n) ? {
+      job: getFullReferencedJobName(n.job, componentName, env, allRawJobs),
+      artifacts: n.artifacts
+    } : getFullReferencedJobName(n, componentName, env, allRawJobs);
+  });
+  var needsFromOtherComponents = (_b = job.needsOtherComponent) === null || _b === void 0 ? void 0 : _b.map(function (other) {
+    return {
+      artifacts: other.artifacts,
+      job: getFullReferencedJobName(other.job, other.componentName, env, allRawJobs)
+    };
+  });
+
+  var needs = __spreadArray(__spreadArray([], __read(needsFromNeeds !== null && needsFromNeeds !== void 0 ? needsFromNeeds : []), false), __read(needsFromOtherComponents !== null && needsFromOtherComponents !== void 0 ? needsFromOtherComponents : []), false);
+
   return __assign(__assign({}, job), {
     stage: stage,
-    needs: (_a = job.needs) === null || _a === void 0 ? void 0 : _a.map(function (n) {
-      return (0, lodash_1.isObject)(n) ? {
-        job: getFullReferencedJobName(n.job, componentName, env, allRawJobs),
-        artifacts: n.artifacts
-      } : getFullReferencedJobName(n, componentName, env, allRawJobs);
-    }),
-    environment: ((_b = job.environment) === null || _b === void 0 ? void 0 : _b.on_stop) ? __assign(__assign({}, job.environment), {
+    needs: needs,
+    environment: ((_c = job.environment) === null || _c === void 0 ? void 0 : _c.on_stop) ? __assign(__assign({}, job.environment), {
       on_stop: getFullReferencedJobName(job.environment.on_stop, componentName, env, allRawJobs)
     }) : job.environment
   });

package/dist/pipeline/gitlab/makeGitlabJob.d.ts

@@ -3,6 +3,7 @@ import { CatladderJob } from "../../types/jobs";
 export declare const makeGitlabJob: ({
   envMode,
   needsStages,
+  needsOtherComponent,
   name,
   ...rest
 }: CatladderJob<string>) => GitlabJobDef;

package/dist/pipeline/gitlab/makeGitlabJob.js

@@ -33,8 +33,9 @@ var defaults_1 = require("../../defaults");
 var makeGitlabJob = function (_a) {
   var envMode = _a.envMode,
       needsStages = _a.needsStages,
+      needsOtherComponent = _a.needsOtherComponent,
       name = _a.name,
-      rest = __rest(_a, ["envMode", "needsStages", "name"]);
+      rest = __rest(_a, ["envMode", "needsStages", "needsOtherComponent", "name"]);
 
   return __assign(__assign({}, rest), {
     retry: defaults_1.BASE_RETRY,