Add latest changes from gitlab-org/gitlab@master

2 files changed, 19 insertions, 4 deletions

diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml
index a6a74aaf98b..d6484c587c1 100644
--- a/.gitlab/ci/global.gitlab-ci.yml
+++ b/.gitlab/ci/global.gitlab-ci.yml
@@ -16,15 +16,23 @@
     - source scripts/utils.sh
     - source scripts/prepare_build.sh
 
-.rails-cache:
+.setup-test-env-cache:
   cache:
-    key: "rails-v3"
+    key: "setup-test-env-v1"
     paths:
       - vendor/ruby/
       - vendor/gitaly-ruby/
       - .go/pkg/mod/
     policy: pull
 
+.rails-cache:
+  cache:
+    key: "rails-v4"
+    paths:
+      - vendor/ruby/
+      - vendor/gitaly-ruby/
+    policy: pull
+
 .static-analysis-cache:
   cache:
     key: "static-analysis-v2"
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml
index bc21a93f23a..7b3168fbbd7 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -141,6 +141,7 @@
 setup-test-env:
   extends:
     - .rails-job-base
+    - .setup-test-env-cache
     - .rails:rules:default-refs-code-backstage-qa
     - .use-pg11
   stage: prepare
@@ -180,14 +181,20 @@ setup-test-env:
       - tmp/tests/second_storage/
     when: always
 
-update-rails-cache:
+update-setup-test-env-cache:
   extends:
     - setup-test-env
     - .shared:rules:update-cache
-  artifacts: {}  # This job's purpose is only to update the cache.
+  artifacts:
+    paths: []  # This job's purpose is only to update the cache.
   cache:
     policy: push  # We want to rebuild the cache from scratch to ensure stale dependencies are cleaned up.
 
+update-rails-cache:
+  extends:
+    - update-setup-test-env-cache
+    - .rails-cache
+
 .coverage-base:
   extends:
     - .default-retry