revert(gitlab): cache from yarn.lock

SocialGouv · Mar 31, 2021 · f24ebb3 · f24ebb3
1 parent 2becc7f
commit f24ebb3
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 45 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -17,8 +17,14 @@ include:
 #
 #
 
-# variables:
+variables:
 #   AUTO_DEVOPS_ENABLE_KAPP: "🕹️"
+  ARTIFACT_COMPRESSION_LEVEL: "fastest"
+  CACHE_COMPRESSION_LEVEL: "fastest"
+  FF_USE_FASTZIP: "true"
+  TRANSFER_METER_FREQUENCY: "1s"
+  YARN_CACHE_FOLDER: "$CI_PROJECT_DIR/.cache/yarn"
+
 
 #
 #
@@ -45,6 +51,14 @@ include:
   extends:
     - .base_kosko_k8s_test
     - .cdtn_base_rules
+  cache:
+    key:
+      files:
+        - .k8s/yarn.lock
+      prefix: k8s
+    paths:
+      - .cache
+      - .k8s/node_modules
   stage: .pre
 
 #
@@ -70,7 +84,6 @@ Stop review:
   variables:
     GIT_STRATEGY: none
   script:
-    - yarn config set cache-folder ${CI_PROJECT_DIR}/.cache/yarn
     - yarn global add degit
     - yarn exec degit "SocialGouv/kosko-charts/templates/autodevops#v5.2.0-alpha.5" .k8s
     - yarn --cwd .k8s --production --frozen-lockfile --prefer-offline --link-duplicates

diff --git a/shared/elasticsearch-document-adapter/.gitlab-ci.yml b/shared/elasticsearch-document-adapter/.gitlab-ci.yml
@@ -11,16 +11,13 @@
     - job: 📦 logger
       artifacts: true
   cache:
-    key: ${CI_JOB_NAME}-${CI_COMMIT_REF_SLUG}
+    key:
+      files:
+        - yarn.lock
+      prefix: ${CI_JOB_NAME}
     paths:
       - .cache
-  variables:
-    CACHE_COMPRESSION_LEVEL: fastest
-    # CACHE_FALLBACK_KEY: ${CI_JOB_NAME}-${CI_DEFAULT_BRANCH}
-    CACHE_FALLBACK_KEY: ${CI_JOB_NAME}-alpha
-    FF_USE_FASTZIP: "true"
   script:
-    - yarn config set cache-folder ${CI_PROJECT_DIR}/.cache/yarn
     - yarn global add @socialgouv/yarn-workspace-focus-install
     - yarn exec yarn-workspace-focus-install
       --

diff --git a/shared/elasticsearch/.gitlab-ci.yml b/shared/elasticsearch/.gitlab-ci.yml
@@ -11,16 +11,13 @@
     - job: 📦 logger
       artifacts: true
   cache:
-    key: ${CI_JOB_NAME}-${CI_COMMIT_REF_SLUG}
+    key:
+      files:
+        - yarn.lock
+      prefix: ${CI_JOB_NAME}
     paths:
       - .cache
-  variables:
-    CACHE_COMPRESSION_LEVEL: fastest
-    # CACHE_FALLBACK_KEY: ${CI_JOB_NAME}-${CI_DEFAULT_BRANCH}
-    CACHE_FALLBACK_KEY: ${CI_JOB_NAME}-alpha
-    FF_USE_FASTZIP: "true"
   script:
-    - yarn config set cache-folder ${CI_PROJECT_DIR}/.cache/yarn
     - yarn global add @socialgouv/yarn-workspace-focus-install
     - yarn exec yarn-workspace-focus-install
       --

diff --git a/shared/logger/.gitlab-ci.yml b/shared/logger/.gitlab-ci.yml
@@ -10,16 +10,13 @@
   needs: []
   image: node:14.16.0-alpine3.11
   cache:
-    key: ${CI_JOB_NAME}-${CI_COMMIT_REF_SLUG}
+    key:
+      files:
+        - yarn.lock
+      prefix: ${CI_JOB_NAME}
     paths:
       - .cache
-  variables:
-    CACHE_COMPRESSION_LEVEL: fastest
-    # CACHE_FALLBACK_KEY: ${CI_JOB_NAME}-${CI_DEFAULT_BRANCH}
-    CACHE_FALLBACK_KEY: ${CI_JOB_NAME}-alpha
-    FF_USE_FASTZIP: "true"
   script:
-    - yarn config set cache-folder ${CI_PROJECT_DIR}/.cache/yarn
     - yarn global add @socialgouv/yarn-workspace-focus-install
     - yarn exec yarn-workspace-focus-install
       --

diff --git a/targets/alert-cli/.gitlab-ci.yml b/targets/alert-cli/.gitlab-ci.yml
@@ -4,16 +4,13 @@
     - .cdtn_base_rules
   image: node:14.16.0-alpine3.11
   cache:
-    key: ${CI_JOB_NAME}-${CI_COMMIT_REF_SLUG}
+    key:
+      files:
+        - yarn.lock
+      prefix: ${CI_JOB_NAME}
     paths:
       - .cache
-  variables:
-    CACHE_COMPRESSION_LEVEL: fastest
-    # CACHE_FALLBACK_KEY: ${CI_JOB_NAME}-${CI_DEFAULT_BRANCH}
-    CACHE_FALLBACK_KEY: ${CI_JOB_NAME}-alpha
-    FF_USE_FASTZIP: "true"
   script:
-    - yarn config set cache-folder ${CI_PROJECT_DIR}/.cache/yarn
     - yarn global add @socialgouv/yarn-workspace-focus-install
     - yarn exec yarn-workspace-focus-install
       --

diff --git a/targets/frontend/.gitlab-ci.yml b/targets/frontend/.gitlab-ci.yml
@@ -10,16 +10,13 @@
   needs: []
   interruptible: true
   cache:
-    key: ${CI_JOB_NAME}-${CI_COMMIT_REF_SLUG}
+    key:
+      files:
+        - yarn.lock
+      prefix: ${CI_JOB_NAME}
     paths:
       - .cache
-  variables:
-    CACHE_COMPRESSION_LEVEL: fastest
-    # CACHE_FALLBACK_KEY: ${CI_JOB_NAME}-${CI_DEFAULT_BRANCH}
-    CACHE_FALLBACK_KEY: ${CI_JOB_NAME}-alpha
-    FF_USE_FASTZIP: "true"
   script:
-    - yarn config set cache-folder ${CI_PROJECT_DIR}/.cache/yarn
     - yarn global add @socialgouv/yarn-workspace-focus-install
     - yarn exec yarn-workspace-focus-install
       --

diff --git a/targets/hasura/.gitlab-ci.yml b/targets/hasura/.gitlab-ci.yml
@@ -16,6 +16,14 @@
     - .base_deploy_kosko_stage
     - .cdtn_base_rules
   stage: .post
+  cache:
+    key:
+      files:
+        - .k8s/yarn.lock
+      prefix: k8s
+    paths:
+      - .cache
+      - .k8s/node_modules
   environment:
     name: ${AUTO_DEVOPS_PROD_ENVIRONMENT_NAME}
   needs:
@@ -35,6 +43,14 @@
   extends:
     - .base_deploy_kosko_stage
     - .cdtn_base_rules
+  cache:
+    key:
+      files:
+        - .k8s/yarn.lock
+      prefix: k8s
+    paths:
+      - .cache
+      - .k8s/node_modules
   rules:
     - if: "$PRODUCTION && $CI_COMMIT_TAG"
       when: always

diff --git a/targets/ingester-elasticsearch/.gitlab-ci.yml b/targets/ingester-elasticsearch/.gitlab-ci.yml
@@ -4,16 +4,13 @@
     - .cdtn_base_rules
   image: node:14.16.0-alpine3.11
   cache:
-    key: ${CI_JOB_NAME}-${CI_COMMIT_REF_SLUG}
+    key:
+      files:
+        - yarn.lock
+      prefix: ${CI_JOB_NAME}
     paths:
       - .cache
-  variables:
-    CACHE_COMPRESSION_LEVEL: fastest
-    # CACHE_FALLBACK_KEY: ${CI_JOB_NAME}-${CI_DEFAULT_BRANCH}
-    CACHE_FALLBACK_KEY: ${CI_JOB_NAME}-alpha
-    FF_USE_FASTZIP: "true"
   script:
-    - yarn config set cache-folder ${CI_PROJECT_DIR}/.cache/yarn
     - yarn global add @socialgouv/yarn-workspace-focus-install
     - yarn exec yarn-workspace-focus-install
       --
@@ -106,9 +103,16 @@
       when: always
     - if: "$PRODUCTION || $RELEASE || $CI_COMMIT_TAG"
       when: never
-    # - when: on_success
     - when: manual
       allow_failure: true
+  cache:
+    key:
+      files:
+        - .k8s/yarn.lock
+      prefix: k8s
+    paths:
+      - .cache
+      - .k8s/node_modules
   environment:
     name: ${CI_COMMIT_REF_SLUG}-dev2
   needs: