From d1c8fb7c82a34984457c4e84e3be46a116bd4d13 Mon Sep 17 00:00:00 2001
From: Toon Claes <toon@gitlab.com>
Date: Mon, 11 Oct 2021 14:25:05 +0200
Subject: [PATCH 1/4] ci: Remove junit report from artifacts

The junit report is mentioned as normal artifact *and* report. This is
not needed, so remove it from the regular artifacts.
---
 .gitlab-ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3eff7984923..4d0d53fbff5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -171,8 +171,6 @@ test:
     - find . -type d \( -path ./_build -o -path ./ruby \) -prune -o -type d -exec chmod a-w {} \;
     - make ${TARGET}
   artifacts:
-    paths:
-      - _build/reports/go-tests-report-go-${GO_VERSION}-git-${GIT_VERSION}.xml
     reports:
       junit: _build/reports/go-tests-report-go-${GO_VERSION}-git-${GIT_VERSION}.xml
   parallel:
-- 
GitLab


From 1a4147d19694c53050d182730619ccae3ea46bdb Mon Sep 17 00:00:00 2001
From: Toon Claes <toon@gitlab.com>
Date: Mon, 11 Oct 2021 14:33:46 +0200
Subject: [PATCH 2/4] ci: Default image uses default versions

The CI yaml file specifies default versions for tools like Ruby and
Golang. But the default image still uses older versions of these tools.

This change uses the default versions of these tools in the default
image. This removes the need the need to specify the image in many jobs.
---
 .gitlab-ci.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4d0d53fbff5..218c39ae06d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
   - qa
 
 default:
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7-golang-1.16-git-2.31
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.31
   tags:
     - gitlab-org
 
@@ -73,7 +73,6 @@ 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.31
   services:
     - postgres:${POSTGRES_VERSION}
   variables: &postgres_variables
@@ -121,7 +120,6 @@ proto:
 
 build:
   stage: build
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.31
   cache:
     <<: *cache_configuration
     policy: pull-push
@@ -141,7 +139,6 @@ build:
 binaries:
   <<: *cache_definition
   stage: build
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.31
   only:
     - tags
   script:
@@ -162,7 +159,6 @@ binaries:
 test:
   <<: *test_definition
   <<: *postgres_definition
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.31
   script:
     - _build/deps/git/install/bin/git version
     # This command will make all directories except of our build directory and Ruby code unwritable.
@@ -194,7 +190,6 @@ test:
 nightly:git:
   <<: *test_definition
   <<: *postgres_definition
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.31
   script:
     - go version
     - make all ${TARGET}
-- 
GitLab


From 1a288e5d4a302efbc14aedec54e4c040a9ccdd7c Mon Sep 17 00:00:00 2001
From: Toon Claes <toon@gitlab.com>
Date: Mon, 11 Oct 2021 14:43:11 +0200
Subject: [PATCH 3/4] ci: Move junit report artifact to test_template

Specify the location of the junit report in the test_template anchor so
every job using the anchor has it.
---
 .gitlab-ci.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 218c39ae06d..933359205c3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,7 +68,9 @@ danger-review:
   stage: test
   artifacts:
     paths:
-    - ruby/tmp/gitaly-rspec-test.log
+      - ruby/tmp/gitaly-rspec-test.log
+    reports:
+      junit: _build/reports/go-tests-report-go-${GO_VERSION}-git-${GIT_VERSION}.xml
     when: on_failure
     expire_in: 1 week
 
@@ -166,9 +168,6 @@ test:
     # they should all instead use a temporary directory for runtime data.
     - find . -type d \( -path ./_build -o -path ./ruby \) -prune -o -type d -exec chmod a-w {} \;
     - make ${TARGET}
-  artifacts:
-    reports:
-      junit: _build/reports/go-tests-report-go-${GO_VERSION}-git-${GIT_VERSION}.xml
   parallel:
     matrix:
       # These definitions are for the non-default Git versions.
-- 
GitLab


From 7edf18576606cfb4b2d43dbc1c75c79ce0e10bf8 Mon Sep 17 00:00:00 2001
From: Toon Claes <toon@gitlab.com>
Date: Mon, 11 Oct 2021 14:48:55 +0200
Subject: [PATCH 4/4] ci: Remove lint job

The verify job runs, amongst other things, the lint target in the
Makefile. So the job to run `make lint` is redundant, therefore this
change removes the lint job.
---
 .gitlab-ci.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 933359205c3..a4502ab6e42 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -273,13 +273,6 @@ pgbouncer_test:
   script:
     - make test-postgres
 
-lint:
-  stage: test
-  retry: 2
-  script:
-    - go version
-    - make lint
-
 objectinfo_fuzz_test:
   extends: .fuzz_base
   stage: test
-- 
GitLab