NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-09 10:02:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'ashmckenzie/reduce-images' into 'master'

Browse source 
Remove bullseye images for gitaly and gitlab

See merge request https://gitlab.com/gitlab-org/gitlab-build-images/-/merge_requests/772

Merged-by: Stan Hu <stanhu@gmail.com>
Approved-by: Stan Hu <stanhu@gmail.com>
Co-authored-by: Ash McKenzie <amckenzie@gitlab.com>
This commit is contained in:
Stan Hu 2024-02-13 03:51:10 +00:00
commit 3f33229de1
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitlab/ci/gitaly.images.yml
View file

@ -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']

8
.gitlab/ci/gitlab.images.yml
View file

@ -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']