@catladder/pipeline 0.0.0-tagged-release-2fffd3dd → 0.0.0-waitfor-deploy-e64a33ba

package/dist/build/base/constants.js

@@ -6,6 +6,6 @@ exports.APP_BUILD_JOB_NAME = "🔨 app";
 exports.RUNNER_BUILD_RESOURCE_VARIABLES = {
   KUBERNETES_CPU_REQUEST: "0.5",
   KUBERNETES_CPU_LIMIT: "2",
-  KUBERNETES_MEMORY_REQUEST: "512Mi",
-  KUBERNETES_MEMORY_LIMIT: "2Gi"
+  KUBERNETES_MEMORY_REQUEST: "1Gi",
+  KUBERNETES_MEMORY_LIMIT: "4Gi"
 };

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

@@ -1,5 +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

@@ -65,35 +65,36 @@ exports.createBuildJob = void 0;
 
 var lodash_1 = require("lodash");
 
-var defaults_1 = require("../../defaults");
+var __1 = require("../..");
 
 var utils_1 = require("../../utils");
 
+var yarn_1 = require("../node/yarn");
+
 var constants_1 = require("./constants");
 
+var getBuildInfo_1 = require("./getBuildInfo");
+
 var createBuildJob = function (context, _a) {
   var _b, _c;
 
   var script = _a.script,
-      def = __rest(_a, ["script"]);
+      variables = _a.variables,
+      def = __rest(_a, ["script", "variables"]);
 
-  var buildInfo = [". getCommitInfo", "echo '{\"id\":\"'$BUILD_ID'\",\"commit\":\"'$BUILD_COMMIT'\",\"tag\":\"'$BUILD_TAG'\",\"time\":\"'$BUILD_TIME'\"}' > ".concat(context.componentConfig.dir, "/__build_info.json")];
-  return {
+  return (0, lodash_1.merge)({
     name: constants_1.APP_BUILD_JOB_NAME,
     envMode: "jobPerEnv",
-    job: (0, lodash_1.merge)({
-      needs: [],
-      cache: [],
-      variables: __assign(__assign(__assign({}, constants_1.RUNNER_BUILD_RESOURCE_VARIABLES), context.environment.envVars), (_b = context.componentConfig.build.extraVars) !== null && _b !== void 0 ? _b : {}),
-      retry: defaults_1.BASE_RETRY,
-      interruptible: true,
-      stage: "build",
-      script: __spreadArray(__spreadArray(__spreadArray([], __read(buildInfo), 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(__spreadArray([], __read((0, getBuildInfo_1.getBuildInfo)(context)), false), __read((0, yarn_1.ensureNodeVersion)(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/base/getBuildInfo.d.ts

@@ -0,0 +1,2 @@
+import { Context } from "../../types";
+export declare const getBuildInfo: (context: Context) => string[];

package/dist/build/base/getBuildInfo.js

@@ -0,0 +1,12 @@
+"use strict";
+
+exports.__esModule = true;
+exports.getBuildInfo = void 0;
+
+var getBuildInfo = function (context) {
+  var _a, _b;
+
+  return ["echo '{\"id\":\"".concat((_a = context.commitInfo) === null || _a === void 0 ? void 0 : _a.buildId, "\",\"time\":\"").concat((_b = context.commitInfo) === null || _b === void 0 ? void 0 : _b.buildTime, "\"}' > ").concat(context.componentConfig.dir, "/__build_info.json")];
+};
+
+exports.getBuildInfo = getBuildInfo;

package/dist/build/docker.d.ts

@@ -1,5 +1,30 @@
-import { GitlabJobDef, Context } from "../types";
+import { Context } from "../types";
+import { CatladderJob } from "../types/jobs";
+export declare const requiresDockerBuild: (context: Context) => boolean;
+export declare const getDockerBuildVariables: (context: Context) => {
+  DOCKER_BUILDKIT: string;
+  DOCKERFILE_ADDITIONS: string | undefined;
+  DOCKERFILE_ADDITIONS_END: string | undefined;
+  APP_DIR: string;
+  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;
+  KUBERNETES_MEMORY_LIMIT: string;
+};
 export declare const DOCKER_BUILD_JOB_NAME = "\uD83D\uDD28 docker";
-export declare const createDockerBuildJob: (context: Context, {
-  script
-}: Pick<GitlabJobDef, "script">) => GitlabJobDef;
+export declare const createDockerBuildJobBase: (context: Context, {
+  script,
+  variables,
+  ...def
+}: Partial<CatladderJob>) => CatladderJob;
+export declare const createDockerBuildJobDefault: (context: Context, {
+  script,
+  ...def
+}: Partial<CatladderJob>) => CatladderJob;

package/dist/build/docker.js

@@ -14,6 +14,17 @@ var __assign = this && this.__assign || function () {
   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;
+};
+
 var __read = this && this.__read || function (o, n) {
   var m = typeof Symbol === "function" && o[Symbol.iterator];
   if (!m) return o;
@@ -50,7 +61,11 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
 };
 
 exports.__esModule = true;
-exports.createDockerBuildJob = exports.DOCKER_BUILD_JOB_NAME = void 0;
+exports.createDockerBuildJobDefault = exports.createDockerBuildJobBase = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = void 0;
+
+var lodash_1 = require("lodash");
+
+var deploy_1 = require("../deploy");
 
 var runner_1 = require("../runner");
 
@@ -60,36 +75,72 @@ var DOCKER_RUNNER_BUILD_VARIABLES = {
   KUBERNETES_MEMORY_REQUEST: "1Gi",
   KUBERNETES_MEMORY_LIMIT: "2Gi"
 };
+
+var requiresDockerBuild = function (context) {
+  var deployConfig = context.componentConfig.deploy;
+
+  if ((0, deploy_1.isOfDeployType)(deployConfig, "kubernetes")) {
+    return true;
+  }
+
+  if ((0, deploy_1.isOfDeployType)(deployConfig, "custom") && deployConfig.requiresDocker) {
+    return true;
+  }
+
+  return false;
+};
+
+exports.requiresDockerBuild = requiresDockerBuild;
+
+var getDockerBuildVariables = function (context) {
+  var _a, _b, _c, _d;
+
+  return __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"),
+    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
+  });
+};
+
+exports.getDockerBuildVariables = getDockerBuildVariables;
 exports.DOCKER_BUILD_JOB_NAME = "🔨 docker";
 
-var createDockerBuildJob = function (context, _a) {
-  var _b, _c, _d, _e;
+var createDockerBuildJobBase = function (context, _a) {
+  var script = _a.script,
+      variables = _a.variables,
+      def = __rest(_a, ["script", "variables"]);
 
-  var script = _a.script;
-  var base = {
+  return (0, lodash_1.merge)({
+    name: exports.DOCKER_BUILD_JOB_NAME,
+    envMode: "jobPerEnv",
     stage: "build",
     image: (0, runner_1.getRunnerImage)("docker-build"),
-    interruptible: true,
     services: [{
       name: "docker:20-dind",
       command: ["--tls=false"]
     }],
-    variables: __assign(__assign({}, DOCKER_RUNNER_BUILD_VARIABLES), {
-      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.componentName,
-      CACHE_IMAGE: "$CI_REGISTRY_IMAGE/" + context.componentName + "/cache:cache"
-    })
-  };
-  return __assign(__assign({}, base), {
-    script: __spreadArray(__spreadArray([], __read(script), false), ["docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY", "docker pull $CACHE_IMAGE || true", "docker build --network host --cache-from $CACHE_IMAGE --tag $IMAGE_NAME:$IMAGE_TAG -f $APP_DIR/Dockerfile .", "docker push $IMAGE_NAME:$IMAGE_TAG", "docker tag $IMAGE_NAME:$IMAGE_TAG $CACHE_IMAGE", "docker push $CACHE_IMAGE"], false)
-  });
+    variables: __assign(__assign({}, (0, exports.getDockerBuildVariables)(context)), variables !== null && variables !== void 0 ? variables : {}),
+    script: script || []
+  }, def);
+};
+
+exports.createDockerBuildJobBase = createDockerBuildJobBase;
+
+var createDockerBuildJobDefault = function (context, _a) {
+  var script = _a.script,
+      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)
+  }, def));
 };
 
-exports.createDockerBuildJob = createDockerBuildJob;
+exports.createDockerBuildJobDefault = createDockerBuildJobDefault;

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/index.js

@@ -48,7 +48,7 @@ exports.BUILD_TYPES = {
     jobs: node_1.createStorybookJobs,
     defaults: function () {
       return {
-        buildCommand: ["yarn storybook", "mv ./storybook-out /dist"]
+        buildCommand: ["yarn build-storybook --quiet -o ./dist"]
       };
     }
   },

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/buildJob.js

@@ -60,14 +60,18 @@ var createBuildJob_1 = require("../base/createBuildJob");
 
 var docker_1 = require("../docker");
 
+var path_1 = require("path");
+
 var types_1 = require("../types");
 
 var cache_1 = require("./cache");
 
+var constants_2 = require("./constants");
+
 var yarn_1 = require("./yarn");
 
 var createNodeBuildJobs = function (context) {
-  var _a;
+  var _a, _b, _c, _d, _e;
 
   var buildConfig = context.componentConfig.build;
 
@@ -77,21 +81,33 @@ var createNodeBuildJobs = function (context) {
 
   var yarnInstall = (0, yarn_1.getYarnInstall)(context);
   var appBuildJob = buildConfig.buildCommand !== null ? (0, createBuildJob_1.createBuildJob)(context, {
+    variables: __assign({}, constants_2.NODE_RUNNER_BUILD_VARIABLES),
     cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context)), false), __read((0, cache_1.getNextCache)(context)), false),
     script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read((_a = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _a !== void 0 ? _a : []), false),
     artifacts: {
-      paths: [context.componentConfig.dir + "/__build_info.json", context.componentConfig.dir + "/dist", context.componentConfig.dir + "/.next"]
+      paths: __spreadArray([(0, path_1.join)(context.componentConfig.dir, "__build_info.json"), (0, path_1.join)(context.componentConfig.dir, "dist"), (0, path_1.join)(context.componentConfig.dir, ".next")], __read((_c = (_b = buildConfig.artifactsPaths) === null || _b === void 0 ? void 0 : _b.map(function (path) {
+        return (0, path_1.join)(context.componentConfig.dir, path);
+      })) !== null && _c !== void 0 ? _c : []), false)
     }
   }) : null;
-  return __spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), [{
-    name: docker_1.DOCKER_BUILD_JOB_NAME,
-    envMode: "jobPerEnv",
-    job: __assign(__assign({}, (0, docker_1.createDockerBuildJob)(context, {
-      script: [buildConfig.type === "node-static" || buildConfig.type === "storybook" ? "ensureNginxDockerfile" : "ensureNodeDockerfile"]
-    })), {
-      needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
-    })
-  }], false);
+  return __spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobDefault)(context, {
+    script: [buildConfig.type === "node-static" || buildConfig.type === "storybook" ? "ensureNginxDockerfile" : "ensureNodeDockerfile"],
+    cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context, "pull")), false),
+    variables: {
+      // only required for non static
+      YARN_INSTALL: (0, yarn_1.getYarnInstallCommand)(context, {
+        prodOnly: true
+      }),
+      YARN_INSTALL_WITHOUT_SCRIPTS: (0, yarn_1.getYarnInstallCommand)(context, {
+        prodOnly: true,
+        noScripts: true
+      }),
+      DOCKER_COPY_WORKSPACE_FILES: (_e = (_d = context.packageManagerInfo) === null || _d === void 0 ? void 0 : _d.pathsToCopyInDocker.map(function (dir) {
+        return "COPY --chown=node:node ".concat(dir, " /app/").concat(dir);
+      })) === null || _e === void 0 ? void 0 : _e.join("\n")
+    },
+    needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
+  })] : []), false);
 };
 
 exports.createNodeBuildJobs = createNodeBuildJobs;

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

@@ -1,4 +1,6 @@
 import { Context } from "../../types/context";
 import { GitlabJobCache } from "../../types/gitlab-types";
-export declare const getNodeCache: (context: Context) => GitlabJobCache[];
+export declare const getYarnCache: (context: Context, policy?: string) => GitlabJobCache[];
+export declare const getNodeModulesCache: (context: Context, policy?: string) => GitlabJobCache[];
+export declare const getNodeCache: (context: Context, policy?: string) => GitlabJobCache[];
 export declare const getNextCache: (context: Context) => GitlabJobCache[];

package/dist/build/node/cache.js

@@ -36,24 +36,52 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
 };
 
 exports.__esModule = true;
-exports.getNextCache = exports.getNodeCache = void 0;
+exports.getNextCache = exports.getNodeCache = exports.getNodeModulesCache = exports.getYarnCache = void 0;
 
 var path_1 = require("path");
 
-var getNodeCache = function (context) {
+var getYarnCache = function (context, policy) {
+  if (policy === void 0) {
+    policy = "pull-push";
+  }
+
+  return [{
+    key: "yarn",
+    policy: policy,
+    paths: [".yarn"]
+  }];
+};
+
+exports.getYarnCache = getYarnCache;
+
+var getNodeModulesCache = function (context, policy) {
   var _a, _b, _c;
 
-  var componentIsInWorkspace = (_a = context.yarnInfo) === null || _a === void 0 ? void 0 : _a.componentIsInWorkspace;
+  if (policy === void 0) {
+    policy = "pull-push";
+  }
+
+  var componentIsInWorkspace = (_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.componentIsInWorkspace;
   return [{
     // if component is in a shared workspace, use workspace cache. use individual cache else
-    key: componentIsInWorkspace ? "node-modules-workspace" : context.componentName + "-node-modules",
-    policy: "pull-push",
-    paths: __spreadArray([".yarn"], __read(componentIsInWorkspace ? __spreadArray(["node_modules"], __read((_c = (_b = context.yarnInfo) === null || _b === void 0 ? void 0 : _b.workspaces.map(function (w) {
+    key: componentIsInWorkspace ? "node-modules-workspace" : context.componentConfig.dir + "-node-modules",
+    policy: policy,
+    paths: __spreadArray([], __read(componentIsInWorkspace ? __spreadArray(["node_modules"], __read((_c = (_b = context.packageManagerInfo) === null || _b === void 0 ? void 0 : _b.workspaces.map(function (w) {
       return (0, path_1.join)(w.location, "node_modules");
     })) !== null && _c !== void 0 ? _c : []), false) : [(0, path_1.join)(context.componentConfig.dir, "node_modules")]), false)
   }];
 };
 
+exports.getNodeModulesCache = getNodeModulesCache;
+
+var getNodeCache = function (context, policy) {
+  if (policy === void 0) {
+    policy = "pull-push";
+  }
+
+  return __spreadArray(__spreadArray([], __read((0, exports.getYarnCache)(context, policy)), false), __read((0, exports.getNodeModulesCache)(context, policy)), false);
+};
+
 exports.getNodeCache = getNodeCache;
 
 var getNextCache = function (context) {

package/dist/build/node/constants.js

@@ -5,6 +5,6 @@ exports.NODE_RUNNER_BUILD_VARIABLES = void 0;
 exports.NODE_RUNNER_BUILD_VARIABLES = {
   KUBERNETES_CPU_REQUEST: "0.5",
   KUBERNETES_CPU_LIMIT: "2",
-  KUBERNETES_MEMORY_REQUEST: "512Mi",
-  KUBERNETES_MEMORY_LIMIT: "2Gi"
+  KUBERNETES_MEMORY_REQUEST: "2Gi",
+  KUBERNETES_MEMORY_LIMIT: "4Gi"
 };

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/meteor.js

@@ -1,19 +1,5 @@
 "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 __read = this && this.__read || function (o, n) {
   var m = typeof Symbol === "function" && o[Symbol.iterator];
   if (!m) return o;
@@ -54,6 +40,8 @@ exports.createMeteorBuildJobs = void 0;
 
 var path_1 = require("path");
 
+var runner_1 = require("../../runner");
+
 var constants_1 = require("../base/constants");
 
 var createBuildJob_1 = require("../base/createBuildJob");
@@ -84,20 +72,16 @@ var createMeteorBuildJobs = function (context) {
   var yarnInstall = (0, yarn_1.getYarnInstall)(context);
   var appBuildJob = buildConfig.buildCommand !== null ? (0, createBuildJob_1.createBuildJob)(context, {
     cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context)), false), __read(getMeteorCache(context)), false),
+    image: (0, runner_1.getRunnerImage)("jobs-meteor"),
     script: __spreadArray(__spreadArray([], __read(yarnInstall), false), ['echo "add healthcheck package"', "meteor add panter:healthroute --allow-superuser", "meteor add qualia:prod-shell --allow-superuser", 'TOOL_NODE_FLAGS="--max_old_space_size=3584 --min_semi_space_size=8 --max_semi_space_size=256 --optimize_for_size" meteor build ./dist --architecture os.linux.x86_64 --allow-superuser --server-only --directory', "cp ./__build_info.json ./dist/bundle/programs/server"], false),
     artifacts: {
       paths: [context.componentConfig.dir + "/__build_info.json", context.componentConfig.dir + "/dist"]
     }
   }) : null;
-  return __spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), [{
-    name: docker_1.DOCKER_BUILD_JOB_NAME,
-    envMode: "jobPerEnv",
-    job: __assign(__assign({}, (0, docker_1.createDockerBuildJob)(context, {
-      script: ["ensureMeteorDockerfile"]
-    })), {
-      needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
-    })
-  }], false);
+  return __spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), [(0, docker_1.createDockerBuildJobDefault)(context, {
+    script: ["ensureMeteorDockerfile"],
+    needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
+  })], false);
 };
 
 exports.createMeteorBuildJobs = createMeteorBuildJobs;

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");
@@ -63,7 +61,7 @@ var constants_1 = require("./constants");
 var yarn_1 = require("./yarn");
 
 var createNodeTestJobs = function (context) {
-  var _a, _b, _c, _d, _e, _f, _g, _h; // don't run tests after release
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j; // don't run tests after release
 
 
   if (((_a = context.commitInfo) === null || _a === void 0 ? void 0 : _a.trigger) === "taggedRelease") {
@@ -76,36 +74,30 @@ 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 : [((_e = context.packageManagerInfo) === null || _e === void 0 ? void 0 : _e.isClassic) ? "yarn audit" : "yarn npm audit --environment production" // yarn 2
+    ]), 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((_g = (0, utils_1.ensureArray)((_f = buildConfig.lint) === null || _f === void 0 ? void 0 : _f.command)) !== null && _g !== void 0 ? _g : ["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((_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;
   return [auditJob, lintJob, testJob].filter(utils_1.notNil);
 };
 

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

@@ -1,2 +1,7 @@
 import { Context } from "../../types";
+export declare const getYarnInstallCommand: (context: Context, options?: {
+  prodOnly?: boolean | undefined;
+  noScripts?: boolean | undefined;
+} | undefined) => string;
+export declare const ensureNodeVersion: (context: Context) => string[];
 export declare const getYarnInstall: (context: Context) => string[];