@catladder/pipeline 1.12.0 → 1.13.0

package/dist/build/base/createBuildJob.d.ts

@@ -1,6 +1,7 @@
-import { Context, GitlabJob, GitlabJobDef } from "../..";
+import { Context } from "../..";
+import { CatladderJob } from "../../types/jobs";
 export declare const createBuildJob: (context: Context, {
   script,
   variables,
   ...def
-}: Partial<GitlabJobDef>) => GitlabJob;
+}: Partial<CatladderJob>) => CatladderJob;

package/dist/build/base/createBuildJob.js

@@ -67,8 +67,6 @@ var lodash_1 = require("lodash");
 
 var __1 = require("../..");
 
-var defaults_1 = require("../../defaults");
-
 var utils_1 = require("../../utils");
 
 var constants_1 = require("./constants");
@@ -82,23 +80,19 @@ var createBuildJob = function (context, _a) {
       variables = _a.variables,
       def = __rest(_a, ["script", "variables"]);
 
-  return {
+  return (0, lodash_1.merge)({
     name: constants_1.APP_BUILD_JOB_NAME,
     envMode: "jobPerEnv",
-    job: (0, lodash_1.merge)({
-      stage: "build",
-      image: (0, __1.getRunnerImage)("jobs-default"),
-      needs: [],
-      cache: [],
-      variables: __assign(__assign(__assign(__assign({}, constants_1.RUNNER_BUILD_RESOURCE_VARIABLES), variables !== null && variables !== void 0 ? variables : {}), context.environment.envVars), (_b = context.componentConfig.build.extraVars) !== null && _b !== void 0 ? _b : {}),
-      retry: defaults_1.BASE_RETRY,
-      interruptible: true,
-      script: __spreadArray(__spreadArray(__spreadArray([], __read((0, getBuildInfo_1.getBuildInfo)(context)), false), ["cd ".concat(context.componentConfig.dir)], false), __read((_c = (0, utils_1.ensureArray)(script)) !== null && _c !== void 0 ? _c : []), false),
-      artifacts: {
-        paths: [context.componentConfig.dir + "/__build_info.json"]
-      }
-    }, def)
-  };
+    stage: "build",
+    image: (0, __1.getRunnerImage)("jobs-default"),
+    needs: [],
+    cache: [],
+    variables: __assign(__assign(__assign(__assign({}, constants_1.RUNNER_BUILD_RESOURCE_VARIABLES), variables !== null && variables !== void 0 ? variables : {}), context.environment.envVars), (_b = context.componentConfig.build.extraVars) !== null && _b !== void 0 ? _b : {}),
+    script: __spreadArray(__spreadArray(__spreadArray([], __read((0, getBuildInfo_1.getBuildInfo)(context)), false), ["cd ".concat(context.componentConfig.dir)], false), __read((_c = (0, utils_1.ensureArray)(script)) !== null && _c !== void 0 ? _c : []), false),
+    artifacts: {
+      paths: [context.componentConfig.dir + "/__build_info.json"]
+    }
+  }, def);
 };
 
 exports.createBuildJob = createBuildJob;

package/dist/build/docker.d.ts

@@ -1,7 +1,8 @@
-import { GitlabJobDef, Context, GitlabJob } from "../types";
+import { Context } from "../types";
+import { CatladderJob } from "../types/jobs";
 export declare const DOCKER_BUILD_JOB_NAME = "\uD83D\uDD28 docker";
 export declare const createDockerBuildJob: (context: Context, {
   script,
   variables,
   ...def
-}: Partial<GitlabJobDef>) => GitlabJob;
+}: Partial<CatladderJob>) => CatladderJob;

package/dist/build/docker.js

@@ -63,10 +63,10 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
 exports.__esModule = true;
 exports.createDockerBuildJob = exports.DOCKER_BUILD_JOB_NAME = void 0;
 
-var runner_1 = require("../runner");
-
 var lodash_1 = require("lodash");
 
+var runner_1 = require("../runner");
+
 var DOCKER_RUNNER_BUILD_VARIABLES = {
   KUBERNETES_CPU_REQUEST: "0.5",
   KUBERNETES_CPU_LIMIT: "1",
@@ -82,33 +82,30 @@ var createDockerBuildJob = function (context, _a) {
       variables = _a.variables,
       def = __rest(_a, ["script", "variables"]);
 
-  return {
+  return (0, lodash_1.merge)({
     name: exports.DOCKER_BUILD_JOB_NAME,
     envMode: "jobPerEnv",
-    job: (0, lodash_1.merge)({
-      stage: "build",
-      image: (0, runner_1.getRunnerImage)("docker-build"),
-      interruptible: true,
-      services: [{
-        name: "docker:20-dind",
-        command: ["--tls=false"]
-      }],
-      variables: __assign(__assign(__assign({}, DOCKER_RUNNER_BUILD_VARIABLES), {
-        DOCKER_BUILDKIT: "1",
-        DOCKERFILE_ADDITIONS: (_c = (_b = context.componentConfig.build.docker) === null || _b === void 0 ? void 0 : _b.additionsBegin) === null || _c === void 0 ? void 0 : _c.join("\n"),
-        DOCKERFILE_ADDITIONS_END: (_e = (_d = context.componentConfig.build.docker) === null || _d === void 0 ? void 0 : _d.additionsEnd) === null || _e === void 0 ? void 0 : _e.join("\n"),
-        APP_DIR: context.componentConfig.dir,
-        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
-      }), variables !== null && variables !== void 0 ? variables : {}),
-      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)
-    }, def)
-  };
+    stage: "build",
+    image: (0, runner_1.getRunnerImage)("docker-build"),
+    services: [{
+      name: "docker:20-dind",
+      command: ["--tls=false"]
+    }],
+    variables: __assign(__assign(__assign({}, DOCKER_RUNNER_BUILD_VARIABLES), {
+      DOCKER_BUILDKIT: "1",
+      DOCKERFILE_ADDITIONS: (_c = (_b = context.componentConfig.build.docker) === null || _b === void 0 ? void 0 : _b.additionsBegin) === null || _c === void 0 ? void 0 : _c.join("\n"),
+      DOCKERFILE_ADDITIONS_END: (_e = (_d = context.componentConfig.build.docker) === null || _d === void 0 ? void 0 : _d.additionsEnd) === null || _e === void 0 ? void 0 : _e.join("\n"),
+      APP_DIR: context.componentConfig.dir,
+      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
+    }), variables !== null && variables !== void 0 ? variables : {}),
+    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)
+  }, def);
 };
 
 exports.createDockerBuildJob = createDockerBuildJob;

package/dist/build/index.d.ts

@@ -1,10 +1,10 @@
 import { Context } from "../types/context";
-import { GitlabJobs } from "../types/gitlab-types";
+import { CatladderJob } from "../types/jobs";
 import { BuildConfig } from "./types";
 export * from "./types";
 export * from "./node";
 export declare type BuildTypes = { [type in BuildConfig["type"]]: {
-  jobs: (context: Context) => GitlabJobs;
+  jobs: (context: Context) => CatladderJob[];
   defaults: () => Partial<Extract<BuildConfig, {
     type: type;
   }>>;

package/dist/build/node/buildJob.d.ts

@@ -1,3 +1,3 @@
 import { Context } from "../../types/context";
-import { GitlabJobs } from "../../types/gitlab-types";
-export declare const createNodeBuildJobs: (context: Context) => GitlabJobs;
+import { CatladderJob } from "../../types/jobs";
+export declare const createNodeBuildJobs: (context: Context) => CatladderJob[];

package/dist/build/node/index.d.ts

@@ -1,5 +1,5 @@
 import type { Context } from "../../types/context";
-import type { GitlabJobs } from "../../types/gitlab-types";
-export declare const createNodeJobs: (context: Context) => GitlabJobs;
-export declare const createStorybookJobs: (context: Context) => GitlabJobs;
-export declare const createMeteorJobs: (context: Context) => GitlabJobs;
+import { CatladderJob } from "../../types/jobs";
+export declare const createNodeJobs: (context: Context) => CatladderJob[];
+export declare const createStorybookJobs: (context: Context) => CatladderJob[];
+export declare const createMeteorJobs: (context: Context) => CatladderJob[];

package/dist/build/node/meteor.d.ts

@@ -1,3 +1,3 @@
 import type { Context } from "../../types/context";
-import type { GitlabJobs } from "../../types/gitlab-types";
-export declare const createMeteorBuildJobs: (context: Context) => GitlabJobs;
+import { CatladderJob } from "../../types/jobs";
+export declare const createMeteorBuildJobs: (context: Context) => CatladderJob[];

package/dist/build/node/testJob.d.ts

@@ -1,3 +1,3 @@
 import { Context } from "../../types/context";
-import { GitlabJobs } from "../../types/gitlab-types";
-export declare const createNodeTestJobs: (context: Context) => GitlabJobs;
+import { CatladderJob } from "../../types/jobs";
+export declare const createNodeTestJobs: (context: Context) => CatladderJob[];

package/dist/build/node/testJob.js

@@ -52,8 +52,6 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
 exports.__esModule = true;
 exports.createNodeTestJobs = void 0;
 
-var defaults_1 = require("../../defaults");
-
 var utils_1 = require("../../utils");
 
 var cache_1 = require("./cache");
@@ -76,36 +74,29 @@ var createNodeTestJobs = function (context) {
       APP_PATH: context.componentConfig.dir
     }, constants_1.NODE_RUNNER_BUILD_VARIABLES), (_b = buildConfig.extraVars) !== null && _b !== void 0 ? _b : {}),
     stage: "test",
-    interruptible: true,
     needs: [],
-    retry: defaults_1.BASE_RETRY
+    envMode: "none"
   };
   var yarnInstall = (0, yarn_1.getYarnInstall)(context);
-  var auditJob = buildConfig.audit !== false ? {
-    name: "🛡 audit",
-    envMode: "none",
-    job: __assign(__assign({}, base), {
-      cache: undefined,
-      script: __spreadArray(["cd ".concat(context.componentConfig.dir)], __read((_d = (0, utils_1.ensureArray)((_c = buildConfig.audit) === null || _c === void 0 ? void 0 : _c.command)) !== null && _d !== void 0 ? _d : ["yarn audit"]), false),
-      allow_failure: true
-    })
-  } : null;
-  var lintJob = buildConfig.lint !== false ? {
-    name: "👮 lint",
-    envMode: "none",
-    job: __assign(__assign({}, base), {
-      cache: (0, cache_1.getNodeCache)(context),
-      script: __spreadArray(__spreadArray(["cd ".concat(context.componentConfig.dir)], __read(yarnInstall), false), __read((_f = (0, utils_1.ensureArray)((_e = buildConfig.lint) === null || _e === void 0 ? void 0 : _e.command)) !== null && _f !== void 0 ? _f : ["yarn lint"]), false)
-    })
-  } : null;
-  var testJob = buildConfig.test !== false ? {
-    name: "🧪 test",
-    envMode: "none",
-    job: __assign(__assign({}, base), {
-      cache: (0, cache_1.getNodeCache)(context),
-      script: __spreadArray(__spreadArray(["cd ".concat(context.componentConfig.dir)], __read(yarnInstall), false), __read((_h = (0, utils_1.ensureArray)((_g = buildConfig.test) === null || _g === void 0 ? void 0 : _g.command)) !== null && _h !== void 0 ? _h : ["yarn test"]), false)
-    })
-  } : null;
+  var auditJob = buildConfig.audit !== false ? __assign(__assign({
+    name: "🛡 audit"
+  }, base), {
+    cache: undefined,
+    script: __spreadArray(["cd ".concat(context.componentConfig.dir)], __read((_d = (0, utils_1.ensureArray)((_c = buildConfig.audit) === null || _c === void 0 ? void 0 : _c.command)) !== null && _d !== void 0 ? _d : ["yarn audit"]), false),
+    allow_failure: true
+  }) : null;
+  var lintJob = buildConfig.lint !== false ? __assign(__assign({
+    name: "👮 lint"
+  }, base), {
+    cache: (0, cache_1.getNodeCache)(context),
+    script: __spreadArray(__spreadArray(["cd ".concat(context.componentConfig.dir)], __read(yarnInstall), false), __read((_f = (0, utils_1.ensureArray)((_e = buildConfig.lint) === null || _e === void 0 ? void 0 : _e.command)) !== null && _f !== void 0 ? _f : ["yarn lint"]), false)
+  }) : null;
+  var testJob = buildConfig.test !== false ? __assign(__assign({
+    name: "🧪 test"
+  }, base), {
+    cache: (0, cache_1.getNodeCache)(context),
+    script: __spreadArray(__spreadArray(["cd ".concat(context.componentConfig.dir)], __read(yarnInstall), false), __read((_h = (0, utils_1.ensureArray)((_g = buildConfig.test) === null || _g === void 0 ? void 0 : _g.command)) !== null && _h !== void 0 ? _h : ["yarn test"]), false)
+  }) : null;
   return [auditJob, lintJob, testJob].filter(utils_1.notNil);
 };
 

package/dist/build/tests/storybook.test.js

@@ -141,17 +141,6 @@ var __generator = this && this.__generator || function (thisArg, body) {
   }
 };
 
-var __rest = this && this.__rest || function (s, e) {
-  var t = {};
-
-  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
-
-  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
-  }
-  return t;
-};
-
 exports.__esModule = true;
 
 var __1 = require("../../");
@@ -181,17 +170,16 @@ describe("storybook build", function () {
     };
     it("creates a pipeline for storybook that does not contain test stages", function () {
       return __awaiter(void 0, void 0, void 0, function () {
-        var _a, image, stages, workflow, jobs;
-
-        return __generator(this, function (_b) {
-          switch (_b.label) {
+        var jobs;
+        return __generator(this, function (_a) {
+          switch (_a.label) {
             case 0:
               return [4
               /*yield*/
-              , (0, __1.createChildPipeline)("mainBranch", config)];
+              , (0, __1.createChildPipeline)("gitlab", "mainBranch", config)];
 
             case 1:
-              _a = _b.sent(), image = _a.image, stages = _a.stages, workflow = _a.workflow, jobs = __rest(_a, ["image", "stages", "workflow"]);
+              jobs = _a.sent().jobs;
               expect(Object.keys(jobs)).toEqual(["dev my-app app-build", "dev my-app docker-build", "dev my-app deploy-to-kubernetes", "dev my-app kubernetes-stop"]);
               return [2
               /*return*/
@@ -202,17 +190,16 @@ describe("storybook build", function () {
     });
     it("runs build and renames folder", function () {
       return __awaiter(void 0, void 0, void 0, function () {
-        var _a, image, stages, workflow, jobs, buildJob;
-
-        return __generator(this, function (_b) {
-          switch (_b.label) {
+        var jobs, buildJob;
+        return __generator(this, function (_a) {
+          switch (_a.label) {
             case 0:
               return [4
               /*yield*/
-              , (0, __1.createChildPipeline)("mainBranch", config)];
+              , (0, __1.createChildPipeline)("gitlab", "mainBranch", config)];
 
             case 1:
-              _a = _b.sent(), image = _a.image, stages = _a.stages, workflow = _a.workflow, jobs = __rest(_a, ["image", "stages", "workflow"]);
+              jobs = _a.sent().jobs;
               buildJob = jobs["dev my-app app-build"];
               expect(buildJob.script).toContain("yarn storybook");
               expect(buildJob.script).toContain("mv ./storybook-out /dist");

package/dist/catladder-gitlab.js

@@ -1,9 +1,36 @@
 "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 __rest = this && this.__rest || function (s, e) {
+  var t = {};
+
+  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+
+  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
+};
+
 exports.__esModule = true;
 
 var fs_1 = require("fs");
 
+var js_yaml_1 = require("js-yaml");
+
 var config_1 = require("./config");
 
 var constants_1 = require("./constants");
@@ -30,8 +57,12 @@ if (trigger) {
     throw new Error("no catladder config found");
   }
 
-  (0, pipeline_1.createChildPipeline)(trigger, config).then(function (mainPipeline) {
-    (0, fs_1.writeFileSync)("__pipeline.yml", JSON.stringify(mainPipeline, null, 2), {
+  (0, pipeline_1.createChildPipeline)("gitlab", trigger, config).then(function (_a) {
+    var jobs = _a.jobs,
+        mainPipeline = __rest(_a, ["jobs"]); // need to spread out the jobs
+
+
+    (0, fs_1.writeFileSync)("__pipeline.yml", (0, js_yaml_1.dump)(__assign(__assign({}, jobs), mainPipeline)), {
       encoding: "utf-8"
     });
   });

package/dist/constants.js

@@ -2,5 +2,5 @@
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "v1-12-0-eb5ba084" || "";
+exports.PIPELINE_IMAGE_TAG = "v1-13-0-186923b2" || "";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "";

package/dist/deploy/base.d.ts

@@ -1,9 +1,8 @@
-import { GitlabJob, Context, GitlabJobDef } from "../types";
+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";
-declare type JobWithoutScript = Omit<GitlabJob, "job"> & {
-  job: Omit<GitlabJobDef, "script">;
-};
+declare type JobWithoutScript = Omit<CatladderJob, "script">;
 export declare const getBaseDeploymentJob: (context: Context) => JobWithoutScript;
 export declare const getBaseDeploymentStopJob: (context: Context) => JobWithoutScript;
 export {};

package/dist/deploy/base.js

@@ -49,20 +49,17 @@ var getBaseDeploymentJob = function (context) {
       stage: "test",
       artifacts: false
     }],
-    job: {
-      rules: [autoDeploy ? {
-        when: "on_success"
-      } : {
-        when: "manual"
-      }],
-      stage: "deploy",
-      dependencies: [],
-      variables: __assign({}, DEPLOY_RUNNER_VARIABLES),
-      environment: __assign(__assign({}, environment), {
-        on_stop: exports.STOP_JOB_NAME,
-        auto_stop_in: autoStop
-      })
-    }
+    rules: [autoDeploy ? {
+      when: "on_success"
+    } : {
+      when: "manual"
+    }],
+    stage: "deploy",
+    variables: __assign({}, DEPLOY_RUNNER_VARIABLES),
+    environment: __assign(__assign({}, environment), {
+      on_stop: exports.STOP_JOB_NAME,
+      auto_stop_in: autoStop
+    })
   };
 };
 
@@ -76,25 +73,22 @@ var getBaseDeploymentStopJob = function (context) {
   return {
     name: exports.STOP_JOB_NAME,
     envMode: "stagePerEnv",
-    job: {
-      needs: [exports.DEPLOY_JOB_NAME],
-      rules: [{
-        "if": "$CI_COMMIT_BRANCH =~ /^[0-9]+\\.([0-9]+|x)\\.x$/",
-        when: "on_success",
-        allow_failure: true
-      }, {
-        when: "manual",
-        allow_failure: true
-      }],
-      variables: __assign(__assign({}, DEPLOY_RUNNER_VARIABLES), {
-        GIT_STRATEGY: "none"
-      }),
-      stage: "stop",
-      dependencies: [],
-      environment: __assign(__assign({}, environment), {
-        action: "stop"
-      })
-    }
+    needs: [exports.DEPLOY_JOB_NAME],
+    rules: [{
+      "if": "$CI_COMMIT_BRANCH =~ /^[0-9]+\\.([0-9]+|x)\\.x$/",
+      when: "on_success",
+      allow_failure: true
+    }, {
+      when: "manual",
+      allow_failure: true
+    }],
+    variables: __assign(__assign({}, DEPLOY_RUNNER_VARIABLES), {
+      GIT_STRATEGY: "none"
+    }),
+    stage: "stop",
+    environment: __assign(__assign({}, environment), {
+      action: "stop"
+    })
   };
 };
 

package/dist/deploy/index.d.ts

@@ -1,11 +1,11 @@
-import { GitlabJobs } from "../types/gitlab-types";
 import { Context } from "../types/context";
+import { CatladderJob } from "../types/jobs";
 import { DeployConfig } from "./types";
 export * from "./kubernetes";
 export * from "./types";
 export * from "./utils";
 export declare type DeployTypes = { [type in DeployConfig["type"]]: {
-  jobs: (context: Context) => GitlabJobs;
+  jobs: (context: Context) => CatladderJob[];
   defaults: () => Partial<Extract<DeployConfig, {
     type: type;
   }>>;

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

@@ -1,3 +1,3 @@
-import { GitlabJobs } from "../../types/gitlab-types";
 import { Context } from "../../types/context";
-export declare const createKubernetesDeployJobs: (context: Context) => GitlabJobs;
+import { CatladderJob } from "../../types/jobs";
+export declare const createKubernetesDeployJobs: (context: Context) => CatladderJob[];

package/dist/deploy/kubernetes/deployJob.js

@@ -52,23 +52,23 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
 exports.__esModule = true;
 exports.createKubernetesDeployJobs = void 0;
 
-var types_1 = require("../types");
+var js_yaml_1 = require("js-yaml");
 
-var runner_1 = require("../../runner");
+var lodash_1 = require("lodash");
 
-var base_1 = require("../base");
+var __1 = require("../..");
 
-var lodash_1 = require("lodash");
+var runner_1 = require("../../runner");
 
-var js_yaml_1 = require("js-yaml");
+var utils_1 = require("../../utils");
 
-var mongodb_1 = require("./mongodb");
+var base_1 = require("../base");
 
-var cloudsql_1 = require("./cloudsql");
+var types_1 = require("../types");
 
-var __1 = require("../..");
+var cloudsql_1 = require("./cloudsql");
 
-var utils_1 = require("../../utils");
+var mongodb_1 = require("./mongodb");
 
 var createKubernetesDeployJobs = function (context) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
@@ -140,43 +140,37 @@ var createKubernetesDeployJobs = function (context) {
     namespace: context.environment.envVars.KUBE_NAMESPACE
   };
   var shared = {
-    job: {
-      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_VALUES: (0, js_yaml_1.dump)(kubeValues, {
-          lineWidth: -1,
-          quotingType: "'",
-          forceQuotes: true
-        }),
-        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"
-      })
-    }
+    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_VALUES: (0, js_yaml_1.dump)(kubeValues, {
+        lineWidth: -1,
+        quotingType: "'",
+        forceQuotes: true
+      }),
+      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"
+    })
   };
   var baseDeploymentJob = (0, base_1.getBaseDeploymentJob)(context);
   var baseStopJob = (0, base_1.getBaseDeploymentStopJob)(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, {
-    job: {
-      script: __spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesCreateSecret", "kubernetesDeploy", "echo deployment successful 😻"], false),
-      environment: {
-        kubernetes: kubernetesEnvironment
-      }
+    script: __spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesCreateSecret", "kubernetesDeploy", "echo deployment successful 😻"], false),
+    environment: {
+      kubernetes: kubernetesEnvironment
     }
   }), (0, lodash_1.merge)({}, baseStopJob, shared, {
-    job: {
-      script: __spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesDelete"], false),
-      environment: {
-        kubernetes: kubernetesEnvironment
-      }
+    script: __spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesDelete"], false),
+    environment: {
+      kubernetes: kubernetesEnvironment
     }
   })];
 };

package/dist/pipeline/createChildPipeline.d.ts

@@ -1,12 +1,3 @@
+import { Pipeline } from "../types";
 import { Config, PipelineTrigger } from "../types/config";
-import { GitlabJobDef } from "../types/gitlab-types";
-export declare const createChildPipeline: (trigger: PipelineTrigger, config: Config) => Promise<{
-  image: string;
-  variables: {
-    FF_USE_FASTZIP: string;
-  };
-  workflow: {
-    rules: import("../types/gitlab-types").GitlabRule[];
-  };
-  stages: string[];
-} & Record<string, GitlabJobDef>>;
+export declare const createChildPipeline: <T extends "gitlab">(type: T, trigger: PipelineTrigger, config: Config) => Promise<Pipeline<T>>;