From 6c649b55fb58312fddfe7f3485c715bd38c80e71 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Sat, 19 May 2018 05:58:22 -0700 Subject: [PATCH 1/2] Bump to Chrome V66 and tie ChromeDriver version to each version of Chrome --- .gitlab-ci.yml | 8 ++------ Dockerfile.custom | 3 ++- scripts/custom-docker-build | 34 ++++++++++++++++++++++++++++------ scripts/install-chrome | 5 +++-- 4 files changed, 35 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f922b0c..2d84b34 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,10 +64,8 @@ ruby-2.4-golang-1.10-git-2.16 test: *test_custom ruby-2.4-golang-1.10-git-2.17 test: *test_custom # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml -ruby-2.3.7-golang-1.9-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom -ruby-2.3.7-golang-1.9-git-2.16-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom -ruby-2.3.7-golang-1.9-git-2.17-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom ruby-2.3.7-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom +ruby-2.3.7-golang-1.9-git-2.17-chrome-66.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom ruby-2.4.1-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom # Not used anymore (?) @@ -113,10 +111,8 @@ ruby-2.4-golang-1.9-git-2.17: *build_and_deploy_custom ruby-2.4-golang-1.10-git-2.17: *build_and_deploy_custom # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml -ruby-2.3.7-golang-1.9-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom -ruby-2.3.7-golang-1.9-git-2.16-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom -ruby-2.3.7-golang-1.9-git-2.17-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom ruby-2.3.7-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom +ruby-2.3.7-golang-1.9-git-2.17-chrome-66.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom ruby-2.4.1-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom # Used by https://gitlab.com/gitlab-org/trello-power-up/blob/master/.gitlab-ci.yml (?) diff --git a/Dockerfile.custom b/Dockerfile.custom index e3331a9..aab0f9e 100644 --- a/Dockerfile.custom +++ b/Dockerfile.custom @@ -21,7 +21,8 @@ RUN if [ -n "$GIT_VERSION" ]; then /scripts/install-git && git --version; fi # Chrome ARG CHROME_VERSION -RUN if [ -n "$CHROME_VERSION" ]; then /scripts/install-chrome $CHROME_VERSION && google-chrome --version; fi +ARG CHROME_DRIVER_VERSION +RUN if [ -n "$CHROME_VERSION" ]; then /scripts/install-chrome $CHROME_VERSION $CHROME_DRIVER_VERSION && google-chrome --version; fi # PhantomJS ARG PHANTOMJS_VERSION diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build index 4493eb4..d4b9984 100755 --- a/scripts/custom-docker-build +++ b/scripts/custom-docker-build @@ -30,12 +30,34 @@ function print_golang_args() { # You may need to bump the version in scripts/install-chrome. function print_chrome_args() { case "$1" in - 60|60.0) CHROME_VERSION=60.0.3112.90-1 ;; - 61|61.0) CHROME_VERSION=61.0.3163.100-1 ;; - 62|62.0) CHROME_VERSION=62.0.3202.89-1 ;; - 63|63.0) CHROME_VERSION=63.0.3239.132-1 ;; - 64|64.0) CHROME_VERSION=64.0.3282.186-1 ;; - 65|65.0) CHROME_VERSION=65.0.3325.181-1 ;; + 60|60.0) + CHROME_VERSION=60.0.3112.90-1 + CHROME_DRIVER_VERSION=2.33 + ;; + 61|61.0) + CHROME_VERSION=61.0.3163.100-1 + CHROME_DRIVER_VERSION=2.34 + ;; + 62|62.0) + CHROME_VERSION=62.0.3202.89-1 + CHROME_DRIVER_VERSION=2.35 + ;; + 63|63.0) + CHROME_VERSION=63.0.3239.132-1 + CHROME_DRIVER_VERSION=2.36 + ;; + 64|64.0) + CHROME_VERSION=64.0.3282.186-1 + CHROME_DRIVER_VERSION=2.36 + ;; + 65|65.0) + CHROME_VERSION=65.0.3325.181-1 + CHROME_DRIVER_VERSION=2.36 + ;; + 66|66.0) + CHROME_VERSION=66.0.3359.181-1 + CHROME_DRIVER_VERSION=2.38 + ;; *) echo "Unknown chrome version $1"; exit 1; esac printf -- "--build-arg CHROME_VERSION=%s " "$CHROME_VERSION" diff --git a/scripts/install-chrome b/scripts/install-chrome index e0d879c..3332ef0 100755 --- a/scripts/install-chrome +++ b/scripts/install-chrome @@ -3,7 +3,8 @@ set -xeuo pipefail IFS=$'\n\t' -CHROME_VERSION=${1:-60.0.3112.90-1} +CHROME_VERSION=${1:-66.0.3359.181-1} +CHROME_DRIVER_VERSION=${2:-2.38} export DEBIAN_FRONTEND=noninteractive curl -sS -L https://dl.google.com/linux/linux_signing_key.pub | apt-key add - @@ -31,6 +32,6 @@ fi rm -rf /var/lib/apt/lists/* # Install ChromeDriver -wget -q https://chromedriver.storage.googleapis.com/2.36/chromedriver_linux64.zip +wget -q https://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip unzip chromedriver_linux64.zip -d /usr/local/bin rm -f chromedriver_linux64.zip From a3d18021ec2ba1e4094092f0826e05a8e51a57d1 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Fri, 8 Jun 2018 10:46:13 -0700 Subject: [PATCH 2/2] Bump to Chrome V67 --- .gitlab-ci.yml | 8 ++++---- scripts/custom-docker-build | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b658b13..92c9c65 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -71,9 +71,9 @@ ruby-2.4-golang-1.10-git-2.17 test: *test_custom # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml ruby-2.4.4-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom -ruby-2.4.4-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom ruby-2.4.4-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom -ruby-2.4.4-golang-1.9-git-2.17-chrome-66.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom +ruby-2.4.4-golang-1.9-git-2.17-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom +ruby-2.4.4-golang-1.9-git-2.17-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom # Not used anymore (?) golang-1.9-git-2.9.0 test: *test_custom @@ -126,8 +126,8 @@ ruby-2.4-golang-1.10-git-2.17: *build_and_deploy_custom # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml ruby-2.4.4-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom ruby-2.4.4-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom -ruby-2.4.4-golang-1.9-git-2.17-chrome-66.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom -ruby-2.4.4-golang-1.9-git-2.17-chrome-66.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom +ruby-2.4.4-golang-1.9-git-2.17-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom +ruby-2.4.4-golang-1.9-git-2.17-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom # Used by https://gitlab.com/gitlab-org/trello-power-up/blob/master/.gitlab-ci.yml (?) node-8.9-chrome-63.0-yarn-1.2: *build_and_deploy_custom diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build index c702269..db0cbd3 100755 --- a/scripts/custom-docker-build +++ b/scripts/custom-docker-build @@ -56,7 +56,11 @@ function print_chrome_args() { ;; 66|66.0) CHROME_VERSION=66.0.3359.181-1 - CHROME_DRIVER_VERSION=2.38 + CHROME_DRIVER_VERSION=2.40 + ;; + 67|67.0) + CHROME_VERSION=67.0.3396.79-1 + CHROME_DRIVER_VERSION=2.40 ;; *) echo "Unknown chrome version $1"; exit 1; esac