Merge branch 'pks-ci-git-patching' into 'master'

ci: Fix Git patches being applied on top of non-default versions

See merge request gitlab-org/gitaly!3857

1 files changed, 22 insertions, 3 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index babe2a13c..fac8c0e9f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -140,8 +140,17 @@ build:
     - _support/test-boot .
   parallel:
     matrix:
+      # These definitions are for the non-default Git versions. We do not want
+      # to apply any additional Git patches on top of those given that they may
+      # not cleanly apply and thus set GIT_PATCHES="".
       - GO_VERSION: [ "1.15", "1.16", "1.17" ]
-        GIT_VERSION: [ "v2.31.1", "v2.32.0", "v2.33.0" ]
+        GIT_VERSION: [ "v2.31.1", "v2.32.0" ]
+        GIT_PATCHES: [ "" ]
+        RUBY_VERSION: [ "2.7" ]
+      # These definitions are for the default Git version where we want to
+      # apply our default set of Git patches.
+      - GO_VERSION: [ "1.15", "1.16", "1.17" ]
+        GIT_VERSION: [ "v2.33.0" ]
         RUBY_VERSION: [ "2.7" ]
 
 binaries:
@@ -183,8 +192,17 @@ test:
       junit: _build/reports/go-tests-report-go-${GO_VERSION}-git-${GIT_VERSION}.xml
   parallel:
     matrix:
+      # These definitions are for the non-default Git versions. We do not want
+      # to apply any additional Git patches on top of those given that they may
+      # not cleanly apply and thus set GIT_PATCHES="".
+      - GO_VERSION: [ "1.15", "1.16", "1.17" ]
+        GIT_VERSION: [ "v2.31.1", "v2.32.0" ]
+        GIT_PATCHES: [ "" ]
+        TARGET: test
+      # These definitions are for the default Git version where we want to
+      # apply our default set of Git patches.
       - GO_VERSION: [ "1.15", "1.16", "1.17" ]
-        GIT_VERSION: [ "v2.31.1", "v2.32.0", "v2.33.0" ]
+        GIT_VERSION: [ "v2.33.0" ]
         TARGET: test
       - GO_VERSION: "1.17"
         TARGET: [ test-with-proxies, test-with-praefect, race-go ]
@@ -195,11 +213,12 @@ nightly:git:
   image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.31
   script:
     - go version
-    - make all ${TARGET} GIT_PATCHES=
+    - make all ${TARGET}
   parallel:
     matrix:
       - GO_VERSION: "1.17"
         GIT_VERSION: ["master", "next"]
+        GIT_PATCHES: [ "" ]
         TARGET: [ test, test-with-proxies, test-with-praefect ]
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule"'