From cdcff3b2f1885bea065854e155bfb53cd014910d Mon Sep 17 00:00:00 2001 From: Paul Okstad Date: Tue, 5 May 2020 15:13:56 +0000 Subject: [PATCH 1/2] Correct Git version for CI tests --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c6053e6c69..87435e1f8f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -126,7 +126,7 @@ test:go1.14-git-2.24-ruby-2.6: <<: *test_definition test:go1.14-git-2.22-ruby-2.6: - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.14-git-2.26 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.14-git-2.22 <<: *test_definition test:go1.13-git-2.26-ruby-2.6: -- GitLab From 9cfaab29180554b4ed4dfd9186d3491928f216eb Mon Sep 17 00:00:00 2001 From: Paul Okstad Date: Wed, 20 May 2020 06:43:48 +0000 Subject: [PATCH 2/2] Correct test job images --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 87435e1f8f..ae6ecd7b3b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -134,11 +134,11 @@ test:go1.13-git-2.26-ruby-2.6: <<: *test_definition test:go1.13-git-2.24-ruby-2.6: - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.22 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.24 <<: *test_definition test:go1.13-git-2.22-ruby-2.6: - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.24 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.22 <<: *test_definition test:proxy: -- GitLab