diff --git a/.gitlab/ci/e2e.images.yml b/.gitlab/ci/e2e.images.yml index 91e1448..4e31d27 100644 --- a/.gitlab/ci/e2e.images.yml +++ b/.gitlab/ci/e2e.images.yml @@ -24,7 +24,7 @@ e2e: - .e2e parallel: matrix: - - OS: ["debian:bullseye", "debian:bookworm"] + - OS: ["debian:bookworm"] RUBY: ['3.0', '3.1', '3.2'] BUNDLER: ['2.4', '2.5'] @@ -41,10 +41,10 @@ e2e-chrome: - e2e-docker parallel: matrix: - - OS: ["debian:bullseye", "debian:bookworm"] + - OS: ["debian:bookworm"] RUBY: ['3.0', '3.1', '3.2'] BUNDLER: ['2.4', '2.5'] - CHROME: ['120'] + CHROME: ['120', '123'] e2e-cng: extends: @@ -60,7 +60,7 @@ e2e-cng: - OS: ['debian:bookworm'] RUBY: ['3.0', '3.1', '3.2'] BUNDLER: ['2.5'] - CHROME: ['120'] + CHROME: ['120', '123'] # Image used for running full e2e test suite e2e-full: diff --git a/.gitlab/ci/gitlab.images.yml b/.gitlab/ci/gitlab.images.yml index 821e736..e49e2a3 100644 --- a/.gitlab/ci/gitlab.images.yml +++ b/.gitlab/ci/gitlab.images.yml @@ -46,7 +46,7 @@ gitlab: RUBY: ['3.0.patched', '3.1.patched', '3.2.patched'] POSTGRESQL: ['13', '14', '15', '16'] GOLANG: ['1.20', '1.21', '1.22'] - CHROME: ['120'] + CHROME: ['120', '123'] # Used by GitLab's compile-production-assets and compile-test-assets jobs gitlab-assets: diff --git a/scripts/install-chrome b/scripts/install-chrome index be05745..70ca40e 100755 --- a/scripts/install-chrome +++ b/scripts/install-chrome @@ -39,7 +39,7 @@ function build_debian() { CHROME_VERSION_BASE=$(echo $CHROME_VERSION | awk -F "." '{print $1 "." $2 "." $3}') CHROME_VERSION_MAJOR=$(echo $CHROME_VERSION | awk -F "." '{print $1}') CHROME_DRIVER_VERSION=$(curl -q https://googlechromelabs.github.io/chrome-for-testing/LATEST_RELEASE_$CHROME_VERSION_BASE) - WEBDRIVER_URL=https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/$CHROME_DRIVER_VERSION/linux64/chromedriver-linux64.zip + WEBDRIVER_URL=https://storage.googleapis.com/chrome-for-testing-public/$CHROME_DRIVER_VERSION/linux64/chromedriver-linux64.zip wget -q -O chromedriver.zip $WEBDRIVER_URL unzip -j chromedriver.zip -d /usr/local/bin diff --git a/scripts/lib/custom-docker-build b/scripts/lib/custom-docker-build index c60dbd7..e8512a9 100755 --- a/scripts/lib/custom-docker-build +++ b/scripts/lib/custom-docker-build @@ -97,6 +97,10 @@ function print_chrome_args() { CHROME_VERSION=120.0.6099.216-1 CHROMIUM_VERSION=120.0.6099.216-1 ;; + 123|123.0) + CHROME_VERSION=123.0.6312.105-1 + CHROMIUM_VERSION=123.0.6312.105-1 + ;; *) fail "Unknown chrome version $1" ;; esac printf -- "--build-arg CHROME_VERSION=%s " "$CHROME_VERSION"