diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-11-24 11:43:43 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-11-25 13:49:19 +0300 |
| commit | 5787cbf1341290fccb91f8708c79c43ba3826c39 (patch) | |
| tree | 08febc1761ed0f516df9dfc6045166dfab4bbc94 /.gitlab-ci.yml | |
| parent | 650665a7f53cfc379182c819ee37180a2a53402b (diff) | |
ci: Deduplicate definition of container image
While we have a global default image, this default image is not
parameterized with the Ruby and Go version. Because of this, we have to
redefine the image in multiple locations, while we don't in others. This
is confusing, and ultimately completely unnecessary: we can just add the
variables in the default image given that we also specify both Ruby and
Go versions as default variables anyway.
Remove the duplicate image definitions and instead parameterize the
default image.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dbe9426d1..3098a1951 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,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 @@ -60,9 +60,8 @@ include: expire_in: 1 week danger-review: - image: ruby:2.7 - allow_failure: true stage: build + allow_failure: true only: - merge_requests except: @@ -85,7 +84,6 @@ danger-review: 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 @@ -105,7 +103,6 @@ build: 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: @@ -125,7 +122,6 @@ build:binaries: test: <<: *test_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. @@ -184,7 +180,6 @@ test:pgbouncer: test:nightly: <<: *test_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} |