Merge branch 'andrey-add-chrome-123' into 'master'

Add chrome v123 to e2e and gitlab images

See merge request https://gitlab.com/gitlab-org/gitlab-build-images/-/merge_requests/795

Merged-by: Rémy Coutable <remy@rymai.me>
Approved-by: Rémy Coutable <remy@rymai.me>
Reviewed-by: Rémy Coutable <remy@rymai.me>
Co-authored-by: Andrejs Cunskis <acunskis@gitlab.com>

.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:

.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:

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

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"