ci: Only cache Gitaly binaries in '.gitaly-binaries-cache'

Signed-off-by: Rémy Coutable <remy@rymai.me>

.gitlab/ci/global.gitlab-ci.yml

@@ -43,20 +43,8 @@
     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
 
-.gitaly-binaries-cache-push: &gitaly-binaries-cache-push
-  <<: *gitaly-binaries-cache
-  policy: push  # We want to rebuild the cache from scratch to ensure stale dependencies are cleaned up.
-
 .go-pkg-cache: &go-pkg-cache
   key: "go-pkg-v1"
   paths:
@@ -125,9 +113,13 @@
   cache:
     - *ruby-gems-cache-push
     - *gitaly-ruby-gems-cache-push
-    - *gitaly-binaries-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

.gitlab/ci/rails.gitlab-ci.yml

@@ -173,7 +173,15 @@ update-setup-test-env-cache:
   extends:
     - setup-test-env
     - .setup-test-env-cache-push
-    - .shared:rules:update-setup-test-env-cache
+    - .shared:rules:update-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.
 

.gitlab/ci/rules.gitlab-ci.yml

@@ -313,9 +313,9 @@
     - <<: *if-security-schedule
     - <<: *if-merge-request-title-update-caches
 
-.shared:rules:update-setup-test-env-cache:
-  extends: .shared:rules:update-cache
+.shared:rules:update-gitaly-binaries-cache:
   rules:
+    - <<: *if-merge-request-title-update-caches
     - changes: *gitaly-patterns
 
 ######################

doc/development/pipelines.md

@@ -557,6 +557,7 @@ request, be sure to start the `dont-interrupt-me` job before pushing.
 1. These cache definitions are composed of [multiple atomic caches](../ci/yaml/README.md#multiple-caches).
 1. Only 6 specific jobs, running in 2-hourly scheduled pipelines, are pushing (i.e. updating) to the caches:
    - `update-setup-test-env-cache`, defined in [`.gitlab/ci/rails.gitlab-ci.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/rails.gitlab-ci.yml).
+   - `update-gitaly-binaries-cache`, defined in [`.gitlab/ci/rails.gitlab-ci.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/rails.gitlab-ci.yml).
    - `update-static-analysis-cache`, defined in [`.gitlab/ci/rails.gitlab-ci.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/rails.gitlab-ci.yml).
    - `update-qa-cache`, defined in [`.gitlab/ci/qa.gitlab-ci.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/qa.gitlab-ci.yml).
    - `update-assets-compile-production-cache`, defined in [`.gitlab/ci/frontend.gitlab-ci.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/frontend.gitlab-ci.yml).