@catladder/pipeline 3.25.0 → 3.26.0

package/examples/__snapshots__/workspace-api-www-turbo-cache.test.ts.snap

@@ -103,7 +103,7 @@ before_script:
     local section_title="\${1}"
       echo -e "section_end:\`date +%s\`:\${section_title}\\r\\e[0K"
     }
-🔸 myWorkspace 🛡 audit:
+'🔸 myWorkspace 🛡 audit | dev ':
   stage: test
   image: path/to/docker/jobs-default:the-version
   variables:
@@ -120,9 +120,6 @@ before_script:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
-    - when: never
-      if: $CI_PIPELINE_SOURCE  == "trigger"
-    - if: $CI_MERGE_REQUEST_ID
   needs: []
   retry: &a1
     max: 2
@@ -131,7 +128,7 @@ before_script:
       - stuck_or_timeout_failure
   interruptible: true
   allow_failure: true
-🔸 myWorkspace 👮 lint:
+'🔸 myWorkspace 👮 lint | dev ':
   stage: test
   image: path/to/docker/jobs-default:the-version
   variables:
@@ -168,13 +165,10 @@ before_script:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
-    - when: never
-      if: $CI_PIPELINE_SOURCE  == "trigger"
-    - if: $CI_MERGE_REQUEST_ID
   needs: []
   retry: *a1
   interruptible: true
-🔸 myWorkspace 🧪 test:
+'🔸 myWorkspace 🧪 test | dev ':
   stage: test
   image: path/to/docker/jobs-testing-chrome:the-version
   variables:
@@ -211,9 +205,6 @@ before_script:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
-    - when: never
-      if: $CI_PIPELINE_SOURCE  == "trigger"
-    - if: $CI_MERGE_REQUEST_ID
   needs: []
   retry: *a1
   interruptible: true
@@ -311,6 +302,115 @@ before_script:
   needs: []
   retry: *a1
   interruptible: true
+'🔸 myWorkspace 🛡 audit | review ':
+  stage: test
+  image: path/to/docker/jobs-default:the-version
+  variables:
+    KUBERNETES_CPU_REQUEST: '0.45'
+    KUBERNETES_MEMORY_REQUEST: 1Gi
+    KUBERNETES_MEMORY_LIMIT: 4Gi
+  script:
+    - collapseable_section_start "injectvars" "Injecting variables"
+    - export APP_PATH="."
+    - collapseable_section_end "injectvars"
+    - cd .
+    - yarn npm audit --environment production
+  rules:
+    - when: never
+      if: $CI_PIPELINE_SOURCE  == "trigger"
+    - if: $CI_MERGE_REQUEST_ID
+  needs: []
+  retry: *a1
+  interruptible: true
+  allow_failure: true
+'🔸 myWorkspace 👮 lint | review ':
+  stage: test
+  image: path/to/docker/jobs-default:the-version
+  variables:
+    KUBERNETES_CPU_REQUEST: '0.45'
+    KUBERNETES_MEMORY_REQUEST: 1Gi
+    KUBERNETES_MEMORY_LIMIT: 4Gi
+  script:
+    - collapseable_section_start "injectvars" "Injecting variables"
+    - export APP_PATH="."
+    - collapseable_section_end "injectvars"
+    - collapseable_section_start "nodeinstall" "Ensure node version"
+    - if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi
+    - if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi
+    - collapseable_section_end "nodeinstall"
+    - cd .
+    - collapseable_section_start "nodeinstall" "Ensure node version"
+    - if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi
+    - if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi
+    - collapseable_section_end "nodeinstall"
+    - collapseable_section_start "yarninstall" "Yarn install"
+    - yarn install --immutable
+    - collapseable_section_end "yarninstall"
+    - yarn lint
+  cache:
+    - key: .-yarn-mr$CI_MERGE_REQUEST_IID
+      policy: pull-push
+      paths:
+        - .yarn
+      fallback_keys:
+        - .-yarn
+    - key: .-node-modules-mr$CI_MERGE_REQUEST_IID
+      policy: pull-push
+      paths:
+        - node_modules
+      fallback_keys:
+        - .-node-modules
+  rules:
+    - when: never
+      if: $CI_PIPELINE_SOURCE  == "trigger"
+    - if: $CI_MERGE_REQUEST_ID
+  needs: []
+  retry: *a1
+  interruptible: true
+'🔸 myWorkspace 🧪 test | review ':
+  stage: test
+  image: path/to/docker/jobs-testing-chrome:the-version
+  variables:
+    KUBERNETES_CPU_REQUEST: '0.45'
+    KUBERNETES_MEMORY_REQUEST: 1Gi
+    KUBERNETES_MEMORY_LIMIT: 4Gi
+  script:
+    - collapseable_section_start "injectvars" "Injecting variables"
+    - export APP_PATH="."
+    - collapseable_section_end "injectvars"
+    - collapseable_section_start "nodeinstall" "Ensure node version"
+    - if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi
+    - if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi
+    - collapseable_section_end "nodeinstall"
+    - cd .
+    - collapseable_section_start "nodeinstall" "Ensure node version"
+    - if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi
+    - if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi
+    - collapseable_section_end "nodeinstall"
+    - collapseable_section_start "yarninstall" "Yarn install"
+    - yarn install --immutable
+    - collapseable_section_end "yarninstall"
+    - yarn test
+  cache:
+    - key: .-yarn-mr$CI_MERGE_REQUEST_IID
+      policy: pull-push
+      paths:
+        - .yarn
+      fallback_keys:
+        - .-yarn
+    - key: .-node-modules-mr$CI_MERGE_REQUEST_IID
+      policy: pull-push
+      paths:
+        - node_modules
+      fallback_keys:
+        - .-node-modules
+  rules:
+    - when: never
+      if: $CI_PIPELINE_SOURCE  == "trigger"
+    - if: $CI_MERGE_REQUEST_ID
+  needs: []
+  retry: *a1
+  interruptible: true
 '🔸 myWorkspace 🔨 app | review ':
   stage: build
   image: path/to/docker/jobs-default:the-version
@@ -370,20 +470,26 @@ before_script:
     - collapseable_section_end "yarninstall"
     - yarn build
   cache:
-    - key: .-yarn
+    - key: .-yarn-mr$CI_MERGE_REQUEST_IID
       policy: pull-push
       paths:
         - .yarn
-    - key: .-node-modules
+      fallback_keys:
+        - .-yarn
+    - key: .-node-modules-mr$CI_MERGE_REQUEST_IID
       policy: pull-push
       paths:
         - node_modules
-    - key: myWorkspace-default
+      fallback_keys:
+        - .-node-modules
+    - key: myWorkspace-default-mr$CI_MERGE_REQUEST_IID
       policy: pull-push
       paths:
         - .turbo
         - api/.component-custom-cache
         - www/.next/cache
+      fallback_keys:
+        - myWorkspace-default
   artifacts:
     paths:
       - api/.next
@@ -772,11 +878,11 @@ before_script:
     - when: on_success
       if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
   needs:
-    - job: 🔸 myWorkspace 👮 lint
+    - job: '🔸 myWorkspace 👮 lint | dev '
       artifacts: false
-    - job: 🔸 myWorkspace 🧪 test
+    - job: '🔸 myWorkspace 🧪 test | dev '
       artifacts: false
-    - job: 🔸 myWorkspace 🛡 audit
+    - job: '🔸 myWorkspace 🛡 audit | dev '
       artifacts: false
     - job: '🔹 api 🔨 docker | dev '
       artifacts: false
@@ -867,10 +973,12 @@ before_script:
     - docker push $DOCKER_CACHE_IMAGE
     - collapseable_section_end "docker-push"
   cache:
-    - key: api-yarn
+    - key: api-yarn-mr$CI_MERGE_REQUEST_IID
       policy: pull
       paths:
         - api/.yarn
+      fallback_keys:
+        - api-yarn
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -1001,11 +1109,11 @@ before_script:
     - when: on_success
       if: $CI_MERGE_REQUEST_ID
   needs:
-    - job: 🔸 myWorkspace 👮 lint
+    - job: '🔸 myWorkspace 👮 lint | review '
       artifacts: false
-    - job: 🔸 myWorkspace 🧪 test
+    - job: '🔸 myWorkspace 🧪 test | review '
       artifacts: false
-    - job: 🔸 myWorkspace 🛡 audit
+    - job: '🔸 myWorkspace 🛡 audit | review '
       artifacts: false
     - job: '🔹 api 🔨 docker | review '
       artifacts: false
@@ -1671,11 +1779,11 @@ before_script:
     - when: on_success
       if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
   needs:
-    - job: 🔸 myWorkspace 👮 lint
+    - job: '🔸 myWorkspace 👮 lint | dev '
       artifacts: false
-    - job: 🔸 myWorkspace 🧪 test
+    - job: '🔸 myWorkspace 🧪 test | dev '
       artifacts: false
-    - job: 🔸 myWorkspace 🛡 audit
+    - job: '🔸 myWorkspace 🛡 audit | dev '
       artifacts: false
     - job: '🔹 www 🔨 docker | dev '
       artifacts: false
@@ -1766,10 +1874,12 @@ before_script:
     - docker push $DOCKER_CACHE_IMAGE
     - collapseable_section_end "docker-push"
   cache:
-    - key: www-yarn
+    - key: www-yarn-mr$CI_MERGE_REQUEST_IID
       policy: pull
       paths:
         - www/.yarn
+      fallback_keys:
+        - www-yarn
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -1903,11 +2013,11 @@ before_script:
     - when: on_success
       if: $CI_MERGE_REQUEST_ID
   needs:
-    - job: 🔸 myWorkspace 👮 lint
+    - job: '🔸 myWorkspace 👮 lint | review '
       artifacts: false
-    - job: 🔸 myWorkspace 🧪 test
+    - job: '🔸 myWorkspace 🧪 test | review '
       artifacts: false
-    - job: 🔸 myWorkspace 🛡 audit
+    - job: '🔸 myWorkspace 🛡 audit | review '
       artifacts: false
     - job: '🔹 www 🔨 docker | review '
       artifacts: false

package/examples/__snapshots__/workspace-api-www.test.ts.snap

@@ -103,7 +103,7 @@ before_script:
     local section_title="\${1}"
       echo -e "section_end:\`date +%s\`:\${section_title}\\r\\e[0K"
     }
-🔸 myWorkspace 🛡 audit:
+'🔸 myWorkspace 🛡 audit | dev ':
   stage: test
   image: path/to/docker/jobs-default:the-version
   variables:
@@ -120,9 +120,6 @@ before_script:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
-    - when: never
-      if: $CI_PIPELINE_SOURCE  == "trigger"
-    - if: $CI_MERGE_REQUEST_ID
   needs: []
   retry: &a1
     max: 2
@@ -131,7 +128,7 @@ before_script:
       - stuck_or_timeout_failure
   interruptible: true
   allow_failure: true
-🔸 myWorkspace 👮 lint:
+'🔸 myWorkspace 👮 lint | dev ':
   stage: test
   image: path/to/docker/jobs-default:the-version
   variables:
@@ -168,13 +165,10 @@ before_script:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
-    - when: never
-      if: $CI_PIPELINE_SOURCE  == "trigger"
-    - if: $CI_MERGE_REQUEST_ID
   needs: []
   retry: *a1
   interruptible: true
-🔸 myWorkspace 🧪 test:
+'🔸 myWorkspace 🧪 test | dev ':
   stage: test
   image: path/to/docker/jobs-testing-chrome:the-version
   variables:
@@ -211,9 +205,6 @@ before_script:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
-    - when: never
-      if: $CI_PIPELINE_SOURCE  == "trigger"
-    - if: $CI_MERGE_REQUEST_ID
   needs: []
   retry: *a1
   interruptible: true
@@ -309,6 +300,115 @@ before_script:
   needs: []
   retry: *a1
   interruptible: true
+'🔸 myWorkspace 🛡 audit | review ':
+  stage: test
+  image: path/to/docker/jobs-default:the-version
+  variables:
+    KUBERNETES_CPU_REQUEST: '0.45'
+    KUBERNETES_MEMORY_REQUEST: 1Gi
+    KUBERNETES_MEMORY_LIMIT: 4Gi
+  script:
+    - collapseable_section_start "injectvars" "Injecting variables"
+    - export APP_PATH="."
+    - collapseable_section_end "injectvars"
+    - cd .
+    - yarn npm audit --environment production
+  rules:
+    - when: never
+      if: $CI_PIPELINE_SOURCE  == "trigger"
+    - if: $CI_MERGE_REQUEST_ID
+  needs: []
+  retry: *a1
+  interruptible: true
+  allow_failure: true
+'🔸 myWorkspace 👮 lint | review ':
+  stage: test
+  image: path/to/docker/jobs-default:the-version
+  variables:
+    KUBERNETES_CPU_REQUEST: '0.45'
+    KUBERNETES_MEMORY_REQUEST: 1Gi
+    KUBERNETES_MEMORY_LIMIT: 4Gi
+  script:
+    - collapseable_section_start "injectvars" "Injecting variables"
+    - export APP_PATH="."
+    - collapseable_section_end "injectvars"
+    - collapseable_section_start "nodeinstall" "Ensure node version"
+    - if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi
+    - if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi
+    - collapseable_section_end "nodeinstall"
+    - cd .
+    - collapseable_section_start "nodeinstall" "Ensure node version"
+    - if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi
+    - if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi
+    - collapseable_section_end "nodeinstall"
+    - collapseable_section_start "yarninstall" "Yarn install"
+    - yarn install --immutable
+    - collapseable_section_end "yarninstall"
+    - yarn lint
+  cache:
+    - key: .-yarn-mr$CI_MERGE_REQUEST_IID
+      policy: pull-push
+      paths:
+        - .yarn
+      fallback_keys:
+        - .-yarn
+    - key: .-node-modules-mr$CI_MERGE_REQUEST_IID
+      policy: pull-push
+      paths:
+        - node_modules
+      fallback_keys:
+        - .-node-modules
+  rules:
+    - when: never
+      if: $CI_PIPELINE_SOURCE  == "trigger"
+    - if: $CI_MERGE_REQUEST_ID
+  needs: []
+  retry: *a1
+  interruptible: true
+'🔸 myWorkspace 🧪 test | review ':
+  stage: test
+  image: path/to/docker/jobs-testing-chrome:the-version
+  variables:
+    KUBERNETES_CPU_REQUEST: '0.45'
+    KUBERNETES_MEMORY_REQUEST: 1Gi
+    KUBERNETES_MEMORY_LIMIT: 4Gi
+  script:
+    - collapseable_section_start "injectvars" "Injecting variables"
+    - export APP_PATH="."
+    - collapseable_section_end "injectvars"
+    - collapseable_section_start "nodeinstall" "Ensure node version"
+    - if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi
+    - if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi
+    - collapseable_section_end "nodeinstall"
+    - cd .
+    - collapseable_section_start "nodeinstall" "Ensure node version"
+    - if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi
+    - if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi
+    - collapseable_section_end "nodeinstall"
+    - collapseable_section_start "yarninstall" "Yarn install"
+    - yarn install --immutable
+    - collapseable_section_end "yarninstall"
+    - yarn test
+  cache:
+    - key: .-yarn-mr$CI_MERGE_REQUEST_IID
+      policy: pull-push
+      paths:
+        - .yarn
+      fallback_keys:
+        - .-yarn
+    - key: .-node-modules-mr$CI_MERGE_REQUEST_IID
+      policy: pull-push
+      paths:
+        - node_modules
+      fallback_keys:
+        - .-node-modules
+  rules:
+    - when: never
+      if: $CI_PIPELINE_SOURCE  == "trigger"
+    - if: $CI_MERGE_REQUEST_ID
+  needs: []
+  retry: *a1
+  interruptible: true
 '🔸 myWorkspace 🔨 app | review ':
   stage: build
   image: path/to/docker/jobs-default:the-version
@@ -368,18 +468,24 @@ before_script:
     - collapseable_section_end "yarninstall"
     - yarn build
   cache:
-    - key: .-yarn
+    - key: .-yarn-mr$CI_MERGE_REQUEST_IID
       policy: pull-push
       paths:
         - .yarn
-    - key: .-node-modules
+      fallback_keys:
+        - .-yarn
+    - key: .-node-modules-mr$CI_MERGE_REQUEST_IID
       policy: pull-push
       paths:
         - node_modules
-    - key: myWorkspace-default
+      fallback_keys:
+        - .-node-modules
+    - key: myWorkspace-default-mr$CI_MERGE_REQUEST_IID
       policy: pull-push
       paths:
         - www/.next/cache
+      fallback_keys:
+        - myWorkspace-default
   artifacts:
     paths:
       - api/.next
@@ -764,11 +870,11 @@ before_script:
     - when: on_success
       if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
   needs:
-    - job: 🔸 myWorkspace 👮 lint
+    - job: '🔸 myWorkspace 👮 lint | dev '
       artifacts: false
-    - job: 🔸 myWorkspace 🧪 test
+    - job: '🔸 myWorkspace 🧪 test | dev '
       artifacts: false
-    - job: 🔸 myWorkspace 🛡 audit
+    - job: '🔸 myWorkspace 🛡 audit | dev '
       artifacts: false
     - job: '🔹 api 🔨 docker | dev '
       artifacts: false
@@ -859,10 +965,12 @@ before_script:
     - docker push $DOCKER_CACHE_IMAGE
     - collapseable_section_end "docker-push"
   cache:
-    - key: api-yarn
+    - key: api-yarn-mr$CI_MERGE_REQUEST_IID
       policy: pull
       paths:
         - api/.yarn
+      fallback_keys:
+        - api-yarn
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -993,11 +1101,11 @@ before_script:
     - when: on_success
       if: $CI_MERGE_REQUEST_ID
   needs:
-    - job: 🔸 myWorkspace 👮 lint
+    - job: '🔸 myWorkspace 👮 lint | review '
       artifacts: false
-    - job: 🔸 myWorkspace 🧪 test
+    - job: '🔸 myWorkspace 🧪 test | review '
       artifacts: false
-    - job: 🔸 myWorkspace 🛡 audit
+    - job: '🔸 myWorkspace 🛡 audit | review '
       artifacts: false
     - job: '🔹 api 🔨 docker | review '
       artifacts: false
@@ -1663,11 +1771,11 @@ before_script:
     - when: on_success
       if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
   needs:
-    - job: 🔸 myWorkspace 👮 lint
+    - job: '🔸 myWorkspace 👮 lint | dev '
       artifacts: false
-    - job: 🔸 myWorkspace 🧪 test
+    - job: '🔸 myWorkspace 🧪 test | dev '
       artifacts: false
-    - job: 🔸 myWorkspace 🛡 audit
+    - job: '🔸 myWorkspace 🛡 audit | dev '
       artifacts: false
     - job: '🔹 www 🔨 docker | dev '
       artifacts: false
@@ -1758,10 +1866,12 @@ before_script:
     - docker push $DOCKER_CACHE_IMAGE
     - collapseable_section_end "docker-push"
   cache:
-    - key: www-yarn
+    - key: www-yarn-mr$CI_MERGE_REQUEST_IID
       policy: pull
       paths:
         - www/.yarn
+      fallback_keys:
+        - www-yarn
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -1895,11 +2005,11 @@ before_script:
     - when: on_success
       if: $CI_MERGE_REQUEST_ID
   needs:
-    - job: 🔸 myWorkspace 👮 lint
+    - job: '🔸 myWorkspace 👮 lint | review '
       artifacts: false
-    - job: 🔸 myWorkspace 🧪 test
+    - job: '🔸 myWorkspace 🧪 test | review '
       artifacts: false
-    - job: 🔸 myWorkspace 🛡 audit
+    - job: '🔸 myWorkspace 🛡 audit | review '
       artifacts: false
     - job: '🔹 www 🔨 docker | review '
       artifacts: false

package/package.json

@@ -53,7 +53,7 @@
     }
   ],
   "license": "MIT",
-  "version": "3.25.0",
+  "version": "3.26.0",
   "scripts": {
     "build:tsc": "yarn tsc",
     "build": "yarn build:compile && yarn build:inline-variables",

package/src/build/custom/testJob.ts

@@ -37,7 +37,6 @@ export const createCustomTestJobs = (
     cache: createJobCacheFromConfig(context, buildConfig),
     stage: "test",
     needs: [],
-    envMode: "none",
   };
   const auditJob: CatladderJob | null = buildConfig.audit
     ? {

package/src/build/node/testJob.ts

@@ -42,7 +42,6 @@ export const createNodeTestJobs = (
     runnerVariables: NODE_RUNNER_BUILD_VARIABLES,
     stage: "test",
     needs: [],
-    envMode: "none",
   };
   const buildConfig = context.build.config;
   const yarnInstall = getYarnInstall(context);

package/src/build/rails/test.ts

@@ -27,7 +27,6 @@ export const createRailsTestJobs = (
     },
     stage: "test",
     needs: [],
-    envMode: "none",
   };
   const defaultImage = "docker.io/ruby";
   const bundlerCacheDir = "tmp/cache";

package/src/pipeline/agent/createAgentReviewJob.ts

@@ -27,6 +27,7 @@ export const createAgentReviewJob = (context: AgentContext): CatladderJob => {
 
   return {
     ...baseJob,
+    envMode: "jobPerEnv",
     name: context.name + "-agent-review",
     allow_failure: true, // make it optional
     rules: [

package/src/pipeline/agent/shared.ts

@@ -8,9 +8,9 @@ import type { AgentContext, CatladderJob } from "../../types";
 
 export const createBaseAgentJob = (
   context: AgentContext,
-): Omit<CatladderJob, "name" | "rules" | "script"> => ({
+): Omit<CatladderJob, "name" | "rules" | "script" | "envMode"> => ({
   stage: "agents",
-  envMode: "none",
+
   // image: "node:24-alpine3.21",
   image: getRunnerImage("agent-claude"),
   variables: {

package/src/pipeline/createMainPipeline.ts

@@ -80,6 +80,7 @@ export const createMainPipeline = async <T extends PipelineType>(
       (acc, { gitlabJob, name, context }) => {
         // merge jobs, if a job is already there, merge the rules
         // this is currently needed because of envMode: "none", which creates the same job for all triggers, so it can appear multiple times
+        // NOTICE: envNode none has been removed and this may no longer be needed
         if (acc[name]) {
           acc[name].gitlabJob.rules = [
             ...(acc[name].gitlabJob.rules ?? []),

package/src/pipeline/gitlab/cache.ts

@@ -0,0 +1,49 @@
+import type {
+  AgentContext,
+  CatladderJobCache,
+  Context,
+  GitlabJobCache,
+} from "../../types";
+
+export const getCacheKeyWithFallbackForMR = (
+  baseKey: string,
+  context: Context,
+) => {
+  // if its a branch, create a key with the branch name with fallback to the base key
+  if (context.trigger === "mr") {
+    return {
+      key: baseKey + "-mr$CI_MERGE_REQUEST_IID",
+      fallback_keys: [baseKey],
+    };
+  }
+
+  return {
+    key: baseKey,
+  };
+};
+
+export const addCacheFallback = (
+  cache: GitlabJobCache | GitlabJobCache[],
+  context: Context | AgentContext,
+) => {
+  if (context.type !== "agent" && context.trigger === "mr") {
+    if (Array.isArray(cache)) {
+      return cache.map((c) => addCacheFallbackToSingleCacheForMR(c, context));
+    }
+    return addCacheFallbackToSingleCacheForMR(cache, context);
+  }
+  return cache;
+};
+
+const addCacheFallbackToSingleCacheForMR = (
+  cache: CatladderJobCache,
+  context: Context,
+) => {
+  if (typeof cache.key === "string") {
+    return {
+      ...cache,
+      ...getCacheKeyWithFallbackForMR(cache.key, context),
+    };
+  }
+  return cache; // as is
+};