From 3fc1f5044db1999cec69d5a54a702a0d2a0329c9 Mon Sep 17 00:00:00 2001 From: Walmyr Lima Date: Tue, 4 Jun 2019 16:54:24 +0200 Subject: [PATCH 1/3] Upgrade to chrome v75 As a try to fix: https://gitlab.com/gitlab-org/gitlab-ce/issues/58882 --- .gitlab-ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 10eb9c4..5f8f137 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-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-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 # 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-75.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-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-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 # 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-75.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 From 59ba945ec46e89af79f91f1dcb7ce6ed1fae52fb Mon Sep 17 00:00:00 2001 From: Walmyr Lima Date: Tue, 4 Jun 2019 17:54:13 +0200 Subject: [PATCH 2/3] Add support for chrome v75 --- scripts/custom-docker-build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build index e83cbe5..3254cac 100755 --- a/scripts/custom-docker-build +++ b/scripts/custom-docker-build @@ -46,6 +46,10 @@ 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.75 + CHROME_DRIVER_VERSION=75.0.3770.8 + ;; *) echo "Unknown chrome version $1"; exit 1; esac printf -- "--build-arg CHROME_VERSION=%s " "$CHROME_VERSION" From fc16350e2a07fca2ea4f83ff10ea4fd72ffb8fe8 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Tue, 4 Jun 2019 14:59:45 -0700 Subject: [PATCH 3/3] Bump Chrome version to 75.0.3770.80 --- scripts/custom-docker-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build index 3254cac..6d3f24a 100755 --- a/scripts/custom-docker-build +++ b/scripts/custom-docker-build @@ -47,7 +47,7 @@ function print_chrome_args() { CHROME_DRIVER_VERSION=73.0.3683.68 ;; 75|75.0) - CHROME_VERSION=75.0.3770.75 + CHROME_VERSION=75.0.3770.80-1 CHROME_DRIVER_VERSION=75.0.3770.8 ;; *) echo "Unknown chrome version $1"; exit 1;