@catladder/pipeline 0.0.0-more-collapse-deeb54d7 → 0.0.0-multiple-gitlab-includes-1a40efc0

package/src/build/docker.ts

@@ -1,27 +1,45 @@
+import { existsSync } from "fs";
 import { merge } from "lodash";
+import path from "path";
+import type { BuildConfig, BuildConfigDocker } from ".";
 import { isOfDeployType } from "../deploy";
+import {
+  getArtifactsRegistryBuildCacheImage,
+  getArtifactsRegistryHost,
+  getArtifactsRegistryImageName,
+} from "../deploy/cloudRun/artifactsRegistry";
+import { gcloudServiceAccountLoginCommands } from "../deploy/cloudRun/utils/gcloudServiceAccountLoginCommands";
 import { getRunnerImage } from "../runner";
-import type { Context } from "../types";
+import type { ComponentContext, DockerBuildJobDefinition } from "../types";
 import type { CatladderJob } from "../types/jobs";
-import { existsSync } from "fs";
-import path from "path";
+import { collapseableSection } from "../utils/gitlab";
+import { createJobCacheFromCacheConfigs } from "./cache/createJobCache";
 
-const DOCKER_RUNNER_BUILD_VARIABLES = {
-  KUBERNETES_CPU_REQUEST: "0.5",
-  KUBERNETES_CPU_LIMIT: "1",
+const DOCKER_BUILD_RUNNER_REQUESTS = {
+  KUBERNETES_CPU_REQUEST: "0.45",
   KUBERNETES_MEMORY_REQUEST: "1Gi",
   KUBERNETES_MEMORY_LIMIT: "2Gi",
 };
 
-export const getDockerImageVariables = (context: Context) => {
+export const getDockerImageVariables = (context: ComponentContext) => {
+  const deployConfig = context.deploy?.config;
   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",
+    ...(isOfDeployType(deployConfig, "google-cloudrun")
+      ? {
+          DOCKER_REGISTRY: getArtifactsRegistryHost(context),
+          DOCKER_IMAGE: getArtifactsRegistryImageName(context),
+          DOCKER_CACHE_IMAGE: getArtifactsRegistryBuildCacheImage(context),
+        }
+      : // gitlab registry:
+        {
+          DOCKER_REGISTRY: "$CI_REGISTRY",
+
+          DOCKER_CACHE_IMAGE: "$CI_REGISTRY_IMAGE/caches/" + context.name,
+          // ONLY USED IN KUBERNETES
+          DOCKER_IMAGE_NAME: context.env + "/" + context.name,
+          DOCKER_IMAGE: "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
+        }),
+
     DOCKER_IMAGE_TAG: "$CI_COMMIT_SHA",
   };
 };
@@ -29,30 +47,54 @@ export const getDockerImageVariables = (context: Context) => {
 /**
  * Weather the context requires a docker build
  */
-export const requiresDockerBuild = ({
-  componentConfig: { deploy },
-}: Context): boolean =>
-  isOfDeployType(deploy, "kubernetes", "google-cloudrun", "dockerTag") ||
-  (isOfDeployType(deploy, "custom") && deploy.requiresDocker);
+export const requiresDockerBuild = (context: ComponentContext): boolean => {
+  const deployConfig = context.deploy?.config;
 
-const getDockerBaseVariables = () => ({
+  return (
+    isOfDeployType(
+      deployConfig,
+      "kubernetes",
+      "google-cloudrun",
+      "dockerTag",
+    ) ||
+    (isOfDeployType(deployConfig, "custom") && deployConfig.requiresDocker)
+  );
+};
+
+// those need to be runner variables
+const getDockerBuildRunnerVariables = () => ({
   DOCKER_HOST: "tcp://0.0.0.0:2375",
   DOCKER_TLS_CERTDIR: "",
   DOCKER_DRIVER: "overlay2",
   DOCKER_BUILDKIT: "1", // see https://docs.docker.com/develop/develop-images/build_enhancements/
 });
 
-export const getDockerBuildVariables = (context: Context) => {
+const getDockerAdditions = (build: BuildConfig) => {
+  if (!("docker" in build)) return {};
+  if (!build.docker) return {};
+
   return {
-    ...DOCKER_RUNNER_BUILD_VARIABLES,
     DOCKERFILE_ADDITIONS:
-      context.componentConfig.build.docker?.additionsBegin?.join("\n"),
+      "additionsBegin" in build.docker
+        ? build.docker.additionsBegin?.join("\n")
+        : undefined,
     DOCKERFILE_ADDITIONS_END:
-      context.componentConfig.build.docker?.additionsEnd?.join("\n"),
-    APP_DIR: context.componentConfig.dir,
-
-    DOCKER_DIR: ".", // relative to componentdir
-    ...getDockerBaseVariables(),
+      "additionsEnd" in build.docker
+        ? build.docker.additionsEnd?.join("\n")
+        : undefined,
+  };
+};
+export const getDockerBuildVariables = (context: ComponentContext) => {
+  return {
+    ...getDockerAdditions(context.build.config),
+    APP_DIR: context.build.dir,
+    DOCKER_BUILD_CONTEXT:
+      "docker" in context.build.config &&
+      context.build.config.docker &&
+      "buildContextLocation" in context.build.config.docker &&
+      context.build.config.docker?.buildContextLocation === "component"
+        ? context.build.dir
+        : ".",
 
     ...getDockerImageVariables(context),
   };
@@ -60,52 +102,106 @@ export const getDockerBuildVariables = (context: Context) => {
 
 export const DOCKER_BUILD_JOB_NAME = "🔨 docker";
 
-export const getDockerJobBaseProps = (context: Context) => {
+export const getDockerJobBaseProps = (): Pick<
+  CatladderJob,
+  "image" | "services" | "variables" | "runnerVariables"
+> => {
   return {
     image: getRunnerImage("docker-build"),
     services: [
       {
-        name: "docker:20-dind", // see see https://gitlab.com/gitlab-org/gitlab-runner/-/issues/27300#note_466755332
-        command: ["--tls=false"],
+        name: "docker:24.0.6-dind", // see see https://gitlab.com/gitlab-org/gitlab-runner/-/issues/27300#note_466755332
+        command: ["--tls=false", "--registry-mirror=https://mirror.gcr.io"],
       },
     ],
-    variables: getDockerBaseVariables(),
+    variables: {},
+    runnerVariables: getDockerBuildRunnerVariables(),
   };
 };
 
-export type DockerBuildJobDefinition = Partial<CatladderJob>;
 export const createDockerBuildJobBase = (
-  context: Context,
-  { script, ...def }: Partial<CatladderJob>
+  context: ComponentContext,
+  { script, cache, ...def }: DockerBuildJobDefinition,
 ): CatladderJob => {
   return merge(
     {
       name: DOCKER_BUILD_JOB_NAME,
       envMode: "jobPerEnv",
       stage: "build",
-      ...getDockerJobBaseProps(context),
+      cache: cache ? createJobCacheFromCacheConfigs(context, cache) : undefined,
+      ...getDockerJobBaseProps(),
       script: script || [],
     },
     {
       variables: getDockerBuildVariables(context),
+      runnerVariables: {
+        ...DOCKER_BUILD_RUNNER_REQUESTS,
+        ...getDockerBuildRunnerVariables(),
+      },
     },
-    def
+    def,
   );
 };
 
-export const gitlabDockerLogin =
-  "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY";
+export const gitlabDockerLogin = (context: ComponentContext) =>
+  context.deploy && isOfDeployType(context.deploy.config, "google-cloudrun")
+    ? [
+        ...gcloudServiceAccountLoginCommands(context),
+        `gcloud auth configure-docker ${getArtifactsRegistryHost(context)}`,
+      ]
+    : [
+        "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY",
+      ];
 
-export const getDockerBuildDefaultScript = (ensureDockerFileScript?: string) =>
+const BUILT_IN_ENSURE_DOCKERFILE_SCRIPTS = {
+  meteor: "ensureMeteorDockerfile",
+  node: "ensureNodeDockerfile",
+  nginx: "ensureNginxDockerfile",
+  custom: null,
+} satisfies {
+  [type in BuildConfigDocker["type"]]: string | null;
+};
+
+export const getDockerBuildScriptWithBuiltInDockerFile = (
+  context: ComponentContext,
+  defaultType?: BuildConfigDocker["type"],
+) => {
+  const type =
+    "docker" in context.build.config &&
+    context.build.config.docker &&
+    "type" in context.build.config.docker
+      ? context.build.config.docker?.type
+      : defaultType;
+  return getDockerBuildDefaultScript(
+    context,
+    type ? BUILT_IN_ENSURE_DOCKERFILE_SCRIPTS[type] : null,
+  );
+};
+export const getDockerBuildDefaultScript = (
+  context: ComponentContext,
+  ensureDockerFileScript?: string | null,
+) =>
   [
-    ensureDockerFileScript,
-    gitlabDockerLogin,
-    "docker version",
-    "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", //BUILDKIT_INLINE_CACHE,  see https://testdriven.io/blog/faster-ci-builds-with-docker-cache/
-    "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
-    "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
-    "docker push $DOCKER_CACHE_IMAGE",
+    ensureDockerFileScript ?? undefined,
+    ...collapseableSection(
+      "docker-login",
+      "Docker Login",
+    )(gitlabDockerLogin(context)),
+    ...collapseableSection(
+      "docker-build",
+      "Docker build",
+    )([
+      "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile $DOCKER_BUILD_CONTEXT --build-arg BUILDKIT_INLINE_CACHE=1", //BUILDKIT_INLINE_CACHE,  see https://testdriven.io/blog/faster-ci-builds-with-docker-cache/
+    ]),
+    ...collapseableSection(
+      "docker-push",
+      "Docker push and tag",
+    )([
+      "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG",
+      "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE",
+      "docker push $DOCKER_CACHE_IMAGE",
+    ]),
   ].filter(Boolean);
 
-export const hasDockerfile = (context: Context) =>
-  existsSync(path.join(context.componentConfig.dir, "Dockerfile"));
+export const hasDockerfile = (context: ComponentContext) =>
+  existsSync(path.join(context.build.dir, "Dockerfile"));

package/src/build/index.ts

@@ -1,20 +1,24 @@
-import type { Context } from "../types/context";
+import type { ComponentContext, WorkspaceContext } from "../types/context";
 import type { EnvironmentContext } from "../types/environmentContext";
 
 import type { CatladderJob } from "../types/jobs";
 import { createCustomJobs } from "./custom";
-import { createNodeJobs, createStorybookJobs, createMeteorJobs } from "./node";
+import { createMeteorJobs, createNodeJobs, createStorybookJobs } from "./node";
 import { createRailsJobs } from "./rails";
 
-import type { BuildConfig, BuildConfigType } from "./types";
-export * from "./types";
+import type {
+  BuildConfig,
+  BuildConfigStandaloneType,
+  WorkspaceBuildConfig,
+} from "./types";
 export * from "./node";
+export * from "./types";
 
 export type BuildTypes = {
-  [type in BuildConfigType]: {
-    jobs: (context: Context) => CatladderJob[];
+  [type in BuildConfigStandaloneType]: {
+    jobs: (context: ComponentContext) => CatladderJob[];
     defaults: (
-      envContext: EnvironmentContext<BuildConfigType, any>
+      envContext: EnvironmentContext,
     ) => Partial<Extract<BuildConfig, { type: type }>>;
   };
 };
@@ -25,37 +29,65 @@ export const BUILD_TYPES: BuildTypes = {
     defaults: () => ({
       buildCommand: "yarn build",
       startCommand: "yarn start",
+      artifactsPaths: ["dist", ".next"],
     }),
   },
   "node-static": {
     jobs: createNodeJobs,
     defaults: () => ({
       buildCommand: "yarn build",
+      artifactsPaths: ["dist"],
     }),
   },
   storybook: {
     jobs: createStorybookJobs,
     defaults: () => ({
       buildCommand: ["yarn build-storybook --quiet -o ./dist"],
+      artifactsPaths: ["dist"],
     }),
   },
   meteor: {
     jobs: createMeteorJobs,
     defaults: () => ({
       startCommand: "node main.js",
+      artifactsPaths: ["dist"],
     }),
   },
   custom: {
     jobs: createCustomJobs,
-    defaults: () => ({}),
+    defaults: () => ({
+      artifactsPaths: ["dist"],
+    }),
   },
   rails: {
     jobs: createRailsJobs,
     defaults: () => ({
       startCommand: "/cnb/process/web",
       cnbBuilder: {
-        image: "heroku/buildpacks:20",
-        packVersion: "0.28.0",
+        image: "heroku/builder:22",
+        packVersion: "0.32.1",
+      },
+    }),
+  },
+};
+
+export type WorkspaceBuildTypes = {
+  [type in WorkspaceBuildConfig["type"]]: {
+    jobs: (context: WorkspaceContext) => CatladderJob[];
+    defaults: () => Partial<Extract<WorkspaceBuildConfig, { type: type }>>;
+  };
+};
+
+export const WORKSPACE_BUILD_TYPES: WorkspaceBuildTypes = {
+  node: {
+    jobs: createNodeJobs,
+    defaults: () => ({
+      buildCommand: "yarn build",
+      lint: {
+        command: "yarn lint",
+      },
+      test: {
+        command: "yarn test",
       },
     }),
   },

package/src/build/node/buildJob.ts

@@ -1,72 +1,75 @@
-import { join } from "path";
-import { getRunnerImage } from "../../runner";
-import type { Context } from "../../types/context";
+import type {
+  BuildContextStandalone,
+  WorkspaceContext,
+} from "../../types/context";
+import {
+  componentContextIsStandaloneBuild,
+  type ComponentContext,
+} from "../../types/context";
+import type {
+  AppBuildJobDefinition,
+  DockerBuildJobDefinition,
+} from "../../types/jobDefinition";
 import type { CatladderJob } from "../../types/jobs";
-import { ensureArray } from "../../utils";
-import { createBuildJobs } from "../base";
-import { getDockerBuildDefaultScript, requiresDockerBuild } from "../docker";
-import { isOfBuildType } from "../types";
-import { getNextCache, getNodeCache, getYarnCache } from "./cache";
-import { NODE_RUNNER_BUILD_VARIABLES } from "./constants";
+import { createComponentBuildJobs, createWorkspaceBuildJobs } from "../base";
+import { createBuildJobDefinition } from "../base/createBuildJobDefinition";
+import { getDockerBuildScriptWithBuiltInDockerFile } from "../docker";
+import type { BuildConfigDocker } from "../types";
+import { getNodeCache, getYarnCache } from "./cache";
 import { getDockerAppCopyAndBuildScript, getYarnInstall } from "./yarn";
 
-export const createNodeBuildJobs = (context: Context): CatladderJob[] => {
-  const buildConfig = context.componentConfig.build;
-
-  if (!isOfBuildType(buildConfig, "node", "node-static", "storybook")) {
-    throw new Error("deploy config is not node, node-static or storybook");
+export const createNodeBuildJobs = (
+  context: ComponentContext | WorkspaceContext,
+): CatladderJob[] => {
+  if (context.type === "workspace") {
+    return createWorkspaceBuildJobs(context, {
+      appBuild: createNodeBuildJobDefinition(context),
+    });
   }
+  return createComponentBuildJobs(context, {
+    appBuild: componentContextIsStandaloneBuild(context)
+      ? createNodeBuildJobDefinition(context)
+      : undefined,
+
+    dockerBuild: createNodeDockerJobDefinition(context),
+  });
+};
+
+export const createNodeBuildJobDefinition = (
+  context: ComponentContext<BuildContextStandalone> | WorkspaceContext,
+): AppBuildJobDefinition | undefined => {
+  const buildConfig = context.build.config;
 
-  const defaultImage = getRunnerImage("jobs-default");
   const yarnInstall = getYarnInstall(context);
+  return createBuildJobDefinition(context, buildConfig, {
+    prescript: yarnInstall,
+    cache: getNodeCache(context),
+  });
+};
 
-  return createBuildJobs(context, {
-    appBuild:
-      buildConfig.buildCommand !== null
-        ? {
-            image: buildConfig.jobImage ?? defaultImage,
-            variables: {
-              ...NODE_RUNNER_BUILD_VARIABLES,
-            },
-            cache: [
-              ...(ensureArray(buildConfig.jobCache) ?? []),
-              ...getNodeCache(context),
-              ...getNextCache(context),
-            ],
-            script: [
-              ...yarnInstall,
-              ...(ensureArray(buildConfig.buildCommand) ?? []),
-            ],
-            artifacts: {
-              paths: [
-                join(context.componentConfig.dir, "__build_info.json"),
-                join(context.componentConfig.dir, "dist"),
-                join(context.componentConfig.dir, ".next"),
-                ...(buildConfig.artifactsPaths?.map((path) =>
-                  join(context.componentConfig.dir, path)
-                ) ?? []),
-              ],
-              expire_in: "1 day",
-            },
-            jobTags: buildConfig.jobTags,
-          }
-        : undefined,
+export const createNodeDockerJobDefinition = (
+  context: ComponentContext,
+): DockerBuildJobDefinition => {
+  // get the default docker built-in type based on the build type
+  const dockerDefaultBuiltIn: BuildConfigDocker["type"] =
+    context.build.buildType === "node-static" ||
+    context.build.buildType === "storybook"
+      ? "nginx"
+      : "node";
 
-    dockerBuild: {
-      script: getDockerBuildDefaultScript(
-        buildConfig.type === "node-static" || buildConfig.type === "storybook"
-          ? "ensureNginxDockerfile"
-          : "ensureNodeDockerfile"
-      ),
-      cache: [...getYarnCache(context, "pull")],
-      variables: {
-        // only required for non static
-        DOCKER_COPY_AND_INSTALL_APP: getDockerAppCopyAndBuildScript(context),
-        DOCKER_COPY_WORKSPACE_FILES:
-          context.packageManagerInfo?.pathsToCopyInDocker
-            .map((dir) => `COPY --chown=node:node ${dir} /app/${dir}`)
-            ?.join("\n"),
-      },
+  return {
+    script: getDockerBuildScriptWithBuiltInDockerFile(
+      context,
+      dockerDefaultBuiltIn,
+    ),
+    cache: [...getYarnCache(context, "pull")],
+    variables: {
+      // only required for non static
+      DOCKER_COPY_AND_INSTALL_APP: getDockerAppCopyAndBuildScript(context),
+      DOCKER_COPY_WORKSPACE_FILES:
+        context.packageManagerInfo?.pathsToCopyInDocker
+          .map((dir) => `COPY --chown=node:node ${dir} /app/${dir}`)
+          ?.join("\n"),
     },
-  });
+  };
 };

package/src/build/node/cache.ts

@@ -1,72 +1,67 @@
+import { uniq } from "lodash";
 import { join } from "path";
 import slugify from "slugify";
-import type { Context } from "../../types/context";
-import type { GitlabJobCache } from "../../types/gitlab-types";
+
+import type { Context, WorkspaceContext } from "../../types/context";
+import type { CacheConfig } from "../types";
 
 export const getYarnCache = (
   context: Context,
-  policy = "pull-push"
-): GitlabJobCache[] => {
+  policy = "pull-push",
+): CacheConfig[] => {
   const componentIsInWorkspace =
-    context.packageManagerInfo?.componentIsInWorkspace;
+    context.type === "component" &&
+    context.packageManagerInfo.componentIsInWorkspace;
   return [
-    componentIsInWorkspace
-      ? {
-          key: "yarn",
-          policy,
-          paths: [".yarn"],
-        }
-      : {
-          key: slugify(context.componentConfig.dir) + "-yarn",
-          policy,
-          paths: [join(context.componentConfig.dir, ".yarn")],
-        },
+    {
+      scope: componentIsInWorkspace ? "global" : "buildDir",
+      pathMode: componentIsInWorkspace ? "absolute" : "relative",
+      key: "yarn",
+      policy,
+      paths: [".yarn"],
+    },
   ];
 };
 
 export const getNodeModulesCache = (
   context: Context,
-  policy = "pull-push"
-): GitlabJobCache[] => {
+  policy = "pull-push",
+): CacheConfig[] => {
   const componentIsInWorkspace =
-    context.packageManagerInfo?.componentIsInWorkspace;
+    context.type === "component" &&
+    context.packageManagerInfo.componentIsInWorkspace;
 
   // We intentionally do not use the contents of yarn.lock as a cache key, as yarn install should always guarantee that the files are updated, but it can still use part of the cache if not all packages are up-to-date.
   // It would slow down all pipelines whenever one adds a new dependency as it will need to download all node_modules again.
   return [
     {
+      scope: "global",
+      pathMode: "absolute",
+
       // if component is in a shared workspace, use workspace cache. use individual cache else
       key: componentIsInWorkspace
         ? "node-modules-workspace"
-        : slugify(context.componentConfig.dir) + "-node-modules", // we use the dirname, not the component name, because in certain cases we have two apps in the same directory and want to share the cache, e.g. when having storybook in the same package.json
+        : slugify(context.build.dir) + "-node-modules", // we use the dirname, not the component name, because in certain cases we have two apps in the same directory and want to share the cache, e.g. when having storybook in the same package.json
       policy,
       paths: [
         ...(componentIsInWorkspace
-          ? [
+          ? uniq([
               "node_modules",
-              ...(context.packageManagerInfo?.workspaces.map((w) =>
-                join(w.location, "node_modules")
+              ...(context.packageManagerInfo.workspaces.map((w) =>
+                join(w.location, "node_modules"),
               ) ?? []),
-            ]
-          : [join(context.componentConfig.dir, "node_modules")]),
+            ])
+          : [join(context.build.dir, "node_modules")]),
       ],
     },
   ];
 };
 export const getNodeCache = (
   context: Context,
-  policy = "pull-push"
-): GitlabJobCache[] => {
+  policy = "pull-push",
+): CacheConfig[] => {
   return [
     ...getYarnCache(context, policy),
     ...getNodeModulesCache(context, policy),
   ];
 };
-
-export const getNextCache = (context: Context): GitlabJobCache[] => [
-  {
-    key: context.componentName + "-next-cache",
-    policy: "pull-push",
-    paths: [context.componentConfig.dir + "/.next/cache/"],
-  },
-];

package/src/build/node/constants.ts

@@ -1,6 +1,5 @@
 export const NODE_RUNNER_BUILD_VARIABLES = {
-  KUBERNETES_CPU_REQUEST: "0.5",
-  KUBERNETES_CPU_LIMIT: "2",
-  KUBERNETES_MEMORY_REQUEST: "2Gi",
+  KUBERNETES_CPU_REQUEST: "0.45",
+  KUBERNETES_MEMORY_REQUEST: "1Gi",
   KUBERNETES_MEMORY_LIMIT: "4Gi",
 };

package/src/build/node/index.ts

@@ -1,17 +1,21 @@
-import type { Context } from "../../types/context";
+import type { ComponentContext, WorkspaceContext } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
 import { createNodeBuildJobs } from "./buildJob";
 import { createMeteorBuildJobs } from "./meteor";
 import { createNodeTestJobs } from "./testJob";
 
-export const createNodeJobs = (context: Context): CatladderJob[] => {
+export const createNodeJobs = (
+  context: ComponentContext | WorkspaceContext,
+): CatladderJob[] => {
   return [...createNodeTestJobs(context), ...createNodeBuildJobs(context)];
 };
 
-export const createStorybookJobs = (context: Context): CatladderJob[] => {
+export const createStorybookJobs = (
+  context: ComponentContext,
+): CatladderJob[] => {
   return [...createNodeBuildJobs(context)];
 };
 
-export const createMeteorJobs = (context: Context): CatladderJob[] => {
+export const createMeteorJobs = (context: ComponentContext): CatladderJob[] => {
   return [...createNodeTestJobs(context), ...createMeteorBuildJobs(context)];
 };