Add latest changes from gitlab-org/gitlab@master

3 files changed, 39 insertions, 14 deletions

diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml
index 3ae7e961aa5..5d17fad0c47 100644
--- a/.gitlab/ci/global.gitlab-ci.yml
+++ b/.gitlab/ci/global.gitlab-ci.yml
@@ -36,6 +36,23 @@
   <<: *gitaly-ruby-gems-cache
   policy: push  # We want to rebuild the cache from scratch to ensure stale dependencies are cleaned up.
 
+.gitaly-binaries-cache: &gitaly-binaries-cache
+  key:
+    files:
+      - GITALY_SERVER_VERSION
+    prefix: "gitaly-binaries"
+  paths:
+    - tmp/tests/gitaly/_build/bin/
+    - tmp/tests/gitaly/config.toml
+    - tmp/tests/gitaly/gitaly2.config.toml
+    - tmp/tests/gitaly/internal/
+    - tmp/tests/gitaly/internal_gitaly2/
+    - tmp/tests/gitaly/internal_sockets/
+    - tmp/tests/gitaly/Makefile
+    - tmp/tests/gitaly/praefect.config.toml
+    - tmp/tests/gitaly/ruby/
+  policy: pull
+
 .go-pkg-cache: &go-pkg-cache
   key: "go-pkg-v1"
   paths:
@@ -97,6 +114,7 @@
   cache:
     - *ruby-gems-cache
     - *gitaly-ruby-gems-cache
+    - *gitaly-binaries-cache
     - *go-pkg-cache
 
 .setup-test-env-cache-push:
@@ -105,6 +123,11 @@
     - *gitaly-ruby-gems-cache-push
     - *go-pkg-cache-push
 
+.gitaly-binaries-cache-push:
+  cache:
+    - <<: *gitaly-binaries-cache
+      policy: push  # We want to rebuild the cache from scratch to ensure stale dependencies are cleaned up.
+
 .rails-cache:
   cache:
     - *ruby-gems-cache
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml
index a30c4ebd413..c4d393eb16c 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -177,6 +177,14 @@ update-setup-test-env-cache:
   artifacts:
     paths: []  # This job's purpose is only to update the cache.
 
+update-gitaly-binaries-cache:
+  extends:
+    - setup-test-env
+    - .gitaly-binaries-cache-push
+    - .shared:rules:update-gitaly-binaries-cache
+  artifacts:
+    paths: []  # This job's purpose is only to update the cache.
+
 .coverage-base:
   extends:
     - .default-retry
@@ -203,13 +211,6 @@ update-static-analysis-cache:
     - .shared:rules:update-cache
   stage: prepare
   script:
-    - git log -n 1 --pretty=format:%H -- .rubocop.yml
-    - git log -n 1 --pretty=format:%H -- .rubocop_manual_todo.yml
-    - git log -n 1 --pretty=format:%H -- .rubocop_todo.yml
-    - git log -n 1 --pretty=format:%H -- rubocop/rubocop-migrations.yml
-    - git log -n 1 --pretty=format:%H -- rubocop/rubocop-usage-data.yml
-    - git log -n 1 --pretty=format:%H -- rubocop/rubocop-code_reuse.yml
-    - bundle exec scripts/debug-rubocop spec/factories/namespace/aggregation_schedules.rb
     - run_timed_command "bundle exec rubocop --parallel"  # For the moment we only cache `tmp/rubocop_cache` so we don't need to run all the tasks.
 
 static-analysis:
@@ -220,13 +221,6 @@ static-analysis:
   parallel: 4
   script:
     - run_timed_command "retry yarn install --frozen-lockfile"
-    - git log -n 1 --pretty=format:%H -- .rubocop.yml
-    - git log -n 1 --pretty=format:%H -- .rubocop_manual_todo.yml
-    - git log -n 1 --pretty=format:%H -- .rubocop_todo.yml
-    - git log -n 1 --pretty=format:%H -- rubocop/rubocop-migrations.yml
-    - git log -n 1 --pretty=format:%H -- rubocop/rubocop-usage-data.yml
-    - git log -n 1 --pretty=format:%H -- rubocop/rubocop-code_reuse.yml
-    - bundle exec scripts/debug-rubocop spec/factories/namespace/aggregation_schedules.rb
     - scripts/static-analysis
 
 static-analysis as-if-foss:
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index affbeedc25a..8dd97c1fe69 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -111,6 +111,9 @@
   - ".gitlab/ci/build-images.gitlab-ci.yml"
   - ".gitlab/ci/qa.gitlab-ci.yml"
 
+.gitaly-patterns: &gitaly-patterns
+  - "GITALY_SERVER_VERSION"
+
 .workhorse-patterns: &workhorse-patterns
   - "GITLAB_WORKHORSE_VERSION"
   - "workhorse/**/*"
@@ -310,6 +313,11 @@
     - <<: *if-security-schedule
     - <<: *if-merge-request-title-update-caches
 
+.shared:rules:update-gitaly-binaries-cache:
+  rules:
+    - <<: *if-merge-request-title-update-caches
+    - changes: *gitaly-patterns
+
 ######################
 # Build images rules #
 ######################