diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5f8f137..10eb9c4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,12 +62,12 @@ 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-75.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-75.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-75.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-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 # gitlab:assets:compile step -ruby-2.6.3-git-2.21-chrome-75.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-8.x-yarn-1.12-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 ruby-2.4.5-git-2.18-chrome-69.0-docker-18.06.1 test: *test_custom @@ -108,12 +108,12 @@ 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-75.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-75.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-75.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-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 # gitlab:assets:compile step -ruby-2.6.3-git-2.21-chrome-75.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-8.x-yarn-1.12-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 ruby-2.4.5-git-2.18-chrome-69.0-docker-18.06.1: *build_and_deploy_custom diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build index 6d3f24a..e83cbe5 100755 --- a/scripts/custom-docker-build +++ b/scripts/custom-docker-build @@ -46,10 +46,6 @@ function print_chrome_args() { CHROME_VERSION=73.0.3683.103-1 CHROME_DRIVER_VERSION=73.0.3683.68 ;; - 75|75.0) - CHROME_VERSION=75.0.3770.80-1 - CHROME_DRIVER_VERSION=75.0.3770.8 - ;; *) echo "Unknown chrome version $1"; exit 1; esac printf -- "--build-arg CHROME_VERSION=%s " "$CHROME_VERSION"