From 558661c17e4e45ba09354124399dfed3e071bc26 Mon Sep 17 00:00:00 2001 From: Ash McKenzie Date: Thu, 8 Feb 2024 17:23:14 +1100 Subject: [PATCH] Remove bullseye images for gitaly and gitlab --- .gitlab/ci/gitaly.images.yml | 2 +- .gitlab/ci/gitlab.images.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab/ci/gitaly.images.yml b/.gitlab/ci/gitaly.images.yml index 6a10d7d..d5cd11a 100644 --- a/.gitlab/ci/gitaly.images.yml +++ b/.gitlab/ci/gitaly.images.yml @@ -17,7 +17,7 @@ gitaly: stage: gitaly parallel: matrix: - - OS: ['debian:bullseye', 'debian:bookworm'] + - OS: ['debian:bookworm'] GOLANG: ['1.20', '1.21'] RUST: ['1.73'] GIT: ['2.36'] diff --git a/.gitlab/ci/gitlab.images.yml b/.gitlab/ci/gitlab.images.yml index c24f0f3..08e8762 100644 --- a/.gitlab/ci/gitlab.images.yml +++ b/.gitlab/ci/gitlab.images.yml @@ -41,7 +41,7 @@ gitlab: NODE: '18.17' parallel: matrix: - - OS: ['debian:bullseye', 'debian:bullseye-slim', 'debian:bookworm', 'debian:bookworm-slim'] + - OS: ['debian:bookworm', 'debian:bookworm-slim'] RUBY: ['3.0.patched', '3.1.patched', '3.2.patched'] POSTGRESQL: ['13', '14', '15'] GOLANG: ['1.20', '1.21'] @@ -60,7 +60,7 @@ gitlab-assets: ARCH: amd64,arm64 parallel: matrix: - - OS: ['debian:bullseye', 'debian:bookworm'] + - OS: ['debian:bookworm'] RUBY: ['3.0', '3.1', '3.2'] GIT: ['2.33'] NODE: ['18.17'] @@ -84,7 +84,7 @@ gitlab-slim-ruby: parallel: matrix: - RUBY: ['3.0', '3.1', '3.2'] - OS: ['debian:bullseye-slim', 'debian:bookworm-slim'] + OS: ['debian:bookworm-slim'] # Used by GitLab's workhorse tests gitlab-workhorse: @@ -97,7 +97,7 @@ gitlab-workhorse: RUBYGEMS: '3.4' parallel: matrix: - - OS: ['debian:bullseye', 'debian:bookworm'] + - OS: ['debian:bookworm'] RUBY: ['3.0', '3.1', '3.2'] GOLANG: ['1.20', '1.21'] RUST: ['1.73']