ci: Drop tests with Git versions older than v2.29.0

As we're about to drop support for any Git version older than v2.29.0,
this commit prepares our CI setup by dropping all jobs which use an
older version than that.

1 files changed, 10 insertions, 12 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1d2521d81..4b632c89c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,13 +4,13 @@ stages:
   - publish
 
 default:
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7-golang-1.14-git-2.28
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7-golang-1.14-git-2.29
   tags:
     - gitlab-org
 
 variables:
   DOCKER_DRIVER: overlay2
-  CUSTOM_IMAGE_VERSION: ruby-2.7-golang-1.13-git-2.28
+  CUSTOM_IMAGE_VERSION: ruby-2.7-golang-1.13-git-2.29
   SAST_DISABLE_DIND: "true"
   SAST_DEFAULT_ANALYZERS: "gosec"
   GIT_VERSION: "v2.29.0"
@@ -69,7 +69,7 @@ danger-review:
     expire_in: 1 week
 
 .postgres_template: &postgres_definition
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.28-pgbouncer-1.14
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.29-pgbouncer-1.14
   services:
     - postgres:11.8
   variables:
@@ -108,7 +108,7 @@ proto:
 build:
   <<: *cache_definition
   stage: build
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.28
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.29
   script:
     - go version
     - make all git
@@ -116,12 +116,12 @@ build:
   parallel:
     matrix:
       - GO_VERSION: [ "1.13", "1.14" ]
-        GIT_VERSION: [ "v2.26.2", "v2.27.0", "v2.28.0", "v2.29.0" ]
+        GIT_VERSION: [ "v2.29.0" ]
 
 binaries:
   <<: *cache_definition
   stage: build
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.28
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.29
   only:
     - tags
   script:
@@ -136,14 +136,12 @@ binaries:
     expire_in: 6 months
   parallel:
     matrix:
-      - GO_VERSION: "1.14"
+      - GO_VERSION: [ "1.13", "1.14" ]
         GIT_VERSION: "v2.29.0"
-      - GO_VERSION: "1.13"
-        GIT_VERSION: "v2.26.2"
 
 test:
   <<: *test_definition
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.28
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.29
   script:
     - go version
     - _build/git/bin/git version
@@ -156,7 +154,7 @@ test:
   parallel:
     matrix:
       - GO_VERSION: [ "1.13", "1.14" ]
-        GIT_VERSION: [ "v2.26.2", "v2.27.0", "v2.28.0", "v2.29.0" ]
+        GIT_VERSION: [ "v2.29.0" ]
         TARGET: test
       - GO_VERSION: "1.14"
         GIT_VERSION: "v2.29.0"
@@ -164,7 +162,7 @@ test:
 
 test:master:
   <<: *test_definition
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.28
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.29
   script:
     - go version
     - make all ${TARGET}