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 'build-buster-images' into 'master'

Browse source 
Build GitLab image with buster as well

See merge request gitlab-org/gitlab-build-images!510
This commit is contained in:
Stan Hu 2022-03-22 17:33:16 +00:00
commit dfde265d68
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,7 +9,7 @@
PGBOUNCER: ['1.14', ''] PGBOUNCER: ['1.14', '']
POSTGRESQL: ['11', '12'] # We only use the postgresql-client POSTGRESQL: ['11', '12'] # We only use the postgresql-client
gitaly:test: gitaly test:
needs: [] needs: []
extends: extends:
- .gitaly-matrix - .gitaly-matrix
@ -20,3 +20,4 @@ gitaly push:
- .gitaly-matrix - .gitaly-matrix
- .build_and_deploy_custom - .build_and_deploy_custom
stage: deploy-gitaly stage: deploy-gitaly
needs: ["gitaly test"]

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

@ -6,7 +6,7 @@
GRAPHICSMAGICK: '1.3.36' GRAPHICSMAGICK: '1.3.36'
parallel: parallel:
matrix: matrix:
- DEBIAN: ['bullseye'] - DEBIAN: ['buster', 'bullseye']
RUBY: ['2.7.patched', '3.0.patched'] RUBY: ['2.7.patched', '3.0.patched']
GIT: ['2.33'] GIT: ['2.33']
POSTGRESQL: ['11', '12', '13'] POSTGRESQL: ['11', '12', '13']
@ -24,6 +24,7 @@ gitlab push:
- .gitlab-matrix - .gitlab-matrix
- .build_and_deploy_custom - .build_and_deploy_custom
stage: deploy-gitlab stage: deploy-gitlab
needs: ["gitlab test"]
# Used by GitLab's compile-production-assets and compile-test-assets jobs # Used by GitLab's compile-production-assets and compile-test-assets jobs
.gitlab-assets-matrix: .gitlab-assets-matrix:
@ -33,7 +34,7 @@ gitlab push:
GRAPHICSMAGICK: '1.3.36' GRAPHICSMAGICK: '1.3.36'
parallel: parallel:
matrix: matrix:
- DEBIAN: ['bullseye'] - DEBIAN: ['buster', 'bullseye']
RUBY: ['2.7', '3.0'] RUBY: ['2.7', '3.0']
GIT: ['2.31', '2.33'] GIT: ['2.31', '2.33']
NODE: ['16.14'] NODE: ['16.14']
@ -48,3 +49,4 @@ gitlab-assets push:
- .gitlab-assets-matrix - .gitlab-assets-matrix
- .build_and_deploy_custom - .build_and_deploy_custom
stage: deploy-gitlab-assets stage: deploy-gitlab-assets
needs: ["gitlab-assets test"]