diff options
| author | Toon Claes <toon@gitlab.com> | 2022-02-11 14:34:25 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2022-02-11 14:34:25 +0300 |
| commit | d3ab199f7923a9d75516b8d1f1ea2f84b03190b1 (patch) | |
| tree | aab7a508017de68fddddf3d4f44657649ed53b7b | |
| parent | 5ec0b26b3de3698267692b82c6092b462a1e7ce1 (diff) | |
| parent | 7a62bd6a72123f7c36eb6bcedce6426d05f0eec6 (diff) | |
Merge branch 'sh-upgrade-ci-debian-bullseye' into 'master'
ci: Upgrade CI images to Debian bullseye
See merge request gitlab-org/gitaly!4340
| -rw-r--r-- | .gitlab-ci.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 818fc3bd4..449656fec 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-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.31 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.33-postgresql-11 tags: - gitlab-org @@ -12,6 +12,7 @@ variables: DOCKER_DRIVER: overlay2 SAST_DISABLE_DIND: "true" SAST_DEFAULT_ANALYZERS: "gosec" + DEBIAN_VERSION: "bullseye" # We use Gitaly's Git version by default. GIT_VERSION: "default" GO_VERSION: "1.17" @@ -45,7 +46,7 @@ include: key: files: - ruby/Gemfile.lock - prefix: ruby-${RUBY_VERSION} + prefix: debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION} paths: - .ruby policy: pull |