Merge branch '63-deprecate-gitaly-build-images-for-ruby-2-6' into 'master'

Deprecate Gitaly build images for Ruby 2.6

Closes #63

See merge request gitlab-org/gitlab-build-images!377
This commit is contained in:
Stan Hu 2021-03-06 00:18:20 +00:00
commit 30b6c4afac

View file

@ -76,9 +76,6 @@ variables:
# Tests
# Used by Gitaly: https://gitlab.com/gitlab-org/gitaly/blob/master/.gitlab-ci.yml
ruby-2.6-golang-1.14-git-2.28 test: *test_custom
ruby-2.6-golang-1.15-git-2.28 test: *test_custom
ruby-2.6-golang-1.15-git-2.28-pgbouncer-1.14 test: *test_custom
ruby-2.7-golang-1.14-git-2.28 test: *test_custom
ruby-2.7-golang-1.15-git-2.28 test: *test_custom
ruby-2.7-golang-1.15-git-2.28-pgbouncer-1.14 test: *test_custom
@ -148,9 +145,6 @@ gitlab-operator-build-base test: *test_build
# Builds
# Used by Gitaly: https://gitlab.com/gitlab-org/gitaly/blob/master/.gitlab-ci.yml
ruby-2.6-golang-1.14-git-2.28 push: *build_and_deploy_custom
ruby-2.6-golang-1.15-git-2.28 push: *build_and_deploy_custom
ruby-2.6-golang-1.15-git-2.28-pgbouncer-1.14 push: *build_and_deploy_custom
ruby-2.7-golang-1.14-git-2.28 push: *build_and_deploy_custom
ruby-2.7-golang-1.15-git-2.28 push: *build_and_deploy_custom
ruby-2.7-golang-1.15-git-2.28-pgbouncer-1.14 push: *build_and_deploy_custom