diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cb99950..4cfe259 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,15 +62,11 @@ ruby-2.5-golang-1.12-git-2.21 test: *test_custom ruby-2.6-golang-1.12-git-2.21 test: *test_custom # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml -ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom -ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-10.x-yarn-1.12-postgresql-10-graphicsmagick-1.3.29 test: *test_custom -ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-10.x-yarn-1.12-postgresql-11-graphicsmagick-1.3.29 test: *test_custom ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.29 test: *test_custom ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-12.x-yarn-1.16-postgresql-11-graphicsmagick-1.3.29 test: *test_custom # gitlab:assets:compile step -ruby-2.6.3-git-2.21-chrome-73.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker-18.06.1 test: *test_custom ruby-2.6.3-git-2.21-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.29-docker-18.06.1 test: *test_custom # Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml @@ -98,7 +94,6 @@ omnibus-gitlab-xenial test: *test_build omnibus-gitlab-depscan test: *test_build release-tools test: *test_build sitespeed-gitlab test: *test_build -www-gitlab-com-2.4 test: *test_build www-gitlab-com-2.6 test: *test_build gitlab-docs-lint test: *test_build @@ -114,15 +109,11 @@ ruby-2.5-golang-1.12-git-2.21: *build_and_deploy_custom ruby-2.6-golang-1.12-git-2.21: *build_and_deploy_custom # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml -ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom -ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-10.x-yarn-1.12-postgresql-10-graphicsmagick-1.3.29: *build_and_deploy_custom -ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-10.x-yarn-1.12-postgresql-11-graphicsmagick-1.3.29: *build_and_deploy_custom ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.29: *build_and_deploy_custom ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-12.x-yarn-1.16-postgresql-11-graphicsmagick-1.3.29: *build_and_deploy_custom # gitlab:assets:compile step -ruby-2.6.3-git-2.21-chrome-73.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker-18.06.1: *build_and_deploy_custom ruby-2.6.3-git-2.21-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.29-docker-18.06.1: *build_and_deploy_custom # Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml @@ -150,7 +141,6 @@ omnibus-gitlab-xenial: *build_and_deploy omnibus-gitlab-depscan: *build_and_deploy release-tools: *build_and_deploy sitespeed-gitlab: *build_and_deploy -www-gitlab-com-2.4: *build_and_deploy www-gitlab-com-2.6: *build_and_deploy gitlab-docs-lint: *build_and_deploy