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 'gitlab-qa-alpine-ruby-3.0' into 'master'

Browse source 
Add Ruby 3.0-based GitLab QA images and stop to build Ruby 2.6 images

Closes #51 and #50

See merge request gitlab-org/gitlab-build-images!351
This commit is contained in:
Stan Hu 2021-01-14 00:53:52 +00:00
commit be25b2d5ff
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.gitlab-ci.yml
View file

@ -100,10 +100,10 @@ ruby-alpine-aws test: *test_build
gitlab-charts-build-base test: *test_build
gitlab-charts-build-base-helm-3 test: *test_build
gitlab-helm3-kubectl1.14 test: *test_build
gitlab-qa-ruby-2.6 test: *test_build
gitlab-qa-ruby-2.7 test: *test_build
gitlab-qa-alpine-ruby-2.6 test: *test_build
gitlab-qa-ruby-3.0 test: *test_build
gitlab-qa-alpine-ruby-2.7 test: *test_build
gitlab-qa-alpine-ruby-3.0 test: *test_build
gitlab-puppeteer test: *test_build
omnibus-gitlab-bionic test: *test_build
omnibus-gitlab-centos7 test: *test_build
@ -175,10 +175,10 @@ ruby-alpine-aws: *build_and_deploy
gitlab-charts-build-base: *build_and_deploy
gitlab-charts-build-base-helm-3: *build_and_deploy
gitlab-helm3-kubectl1.14: *build_and_deploy
gitlab-qa-ruby-2.6: *build_and_deploy
gitlab-qa-ruby-2.7: *build_and_deploy
gitlab-qa-alpine-ruby-2.6: *build_and_deploy
gitlab-qa-ruby-3.0: *build_and_deploy
gitlab-qa-alpine-ruby-2.7: *build_and_deploy
gitlab-qa-alpine-ruby-3.0: *build_and_deploy
gitlab-puppeteer: *build_and_deploy
omnibus-gitlab-bionic: *build_and_deploy
omnibus-gitlab-centos7: *build_and_deploy

2
Dockerfile.gitlab-qa-alpine-ruby-2.6 → Dockerfile.gitlab-qa-alpine-ruby-3.0
View file

@ -3,7 +3,7 @@
# - Nightly QA: https://gitlab.com/gitlab-org/quality/nightly/blob/master/.gitlab-ci.yml
# - QA Pipeline Common: https://gitlab.com/gitlab-org/quality/pipeline-common/-/blob/master/ci/qa.yml, https://gitlab.com/gitlab-org/quality/pipeline-common/-/blob/master/ci/qa-scheduled.yml
FROM ruby:2.6-alpine
FROM ruby:3.0-alpine
MAINTAINER GitLab Quality Team
WORKDIR /home/qa

2
Dockerfile.gitlab-qa-ruby-2.6 → Dockerfile.gitlab-qa-ruby-3.0
View file

@ -1,4 +1,4 @@
FROM ruby:2.6
FROM ruby:3.0
# Enable support for UTF encoded stdin/stdout