From ed1776761c45d1bc6862e34fde42802a440ffbee Mon Sep 17 00:00:00 2001
From: Andrejs Cunskis <acunskis@gitlab.com>
Date: Wed, 5 Oct 2022 09:27:30 +0300
Subject: [PATCH] Update chrome versions

Bump version in kas images
---
 .gitlab/ci/customers.images.yml | 16 +++++++---------
 .gitlab/ci/e2e.images.yml       |  7 ++-----
 .gitlab/ci/gitlab.images.yml    |  2 +-
 .gitlab/ci/kas.images.yml       |  2 +-
 scripts/lib/custom-docker-build | 15 ++++++---------
 5 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/.gitlab/ci/customers.images.yml b/.gitlab/ci/customers.images.yml
index 7bc3210..c2ef62d 100644
--- a/.gitlab/ci/customers.images.yml
+++ b/.gitlab/ci/customers.images.yml
@@ -4,26 +4,24 @@ customers:
     - .build_and_push
   variables:
     LFS: '2.9'
-    CHROME: '101'
+    CHROME: '106'
     NODE: '16.14'
     YARN: '1.22'
     POSTGRESQL: '10'
+    RUBY: '2.7'
+    GIT: '2.33'
   parallel:
     matrix:
-      - RUBY: ['2.7']
-        GIT: ['2.33']
-        DOCKER: ['20.10.14', '']
+      - DOCKER: ['20.10.14', '']
 
 # Used by customers-gitlab-com qa e2e test: https://gitlab.com/gitlab-org/customers-gitlab-com/-/blob/staging/.gitlab/ci/e2e.gitlab-ci.yml
 customers-qa-assets:
   extends:
     - .build_and_push
   variables:
-    CHROME: '101'
+    CHROME: '106'
     NODE: '16.14'
     YARN: '1.22'
     DOCKER: '20.10.14'
-  parallel:
-    matrix:
-      - RUBY: ['2.7']
-        GIT: ['2.33']
+    RUBY: '2.7'
+    GIT: '2.33'
diff --git a/.gitlab/ci/e2e.images.yml b/.gitlab/ci/e2e.images.yml
index 50c6e5c..1d9ba71 100644
--- a/.gitlab/ci/e2e.images.yml
+++ b/.gitlab/ci/e2e.images.yml
@@ -9,7 +9,7 @@ e2e:
     BUNDLER: '2.3'
   parallel:
     matrix:
-      - RUBY: [ '2.7', '3.0' ]
+      - RUBY: ['2.7', '3.0']
 
 # Image with ruby, bundler and docker
 e2e-docker:
@@ -23,10 +23,7 @@ e2e-chrome:
   extends:
     - e2e-docker
   variables:
-    CHROME: '104'
-  parallel:
-    matrix:
-      - RUBY: ['2.7', '3.0']
+    CHROME: '106'
 
 # 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 0fa8507..046ecb2 100644
--- a/.gitlab/ci/gitlab.images.yml
+++ b/.gitlab/ci/gitlab.images.yml
@@ -16,7 +16,7 @@ gitlab:
         POSTGRESQL: ['11', '12', '13']
         GOLANG: ['1.18', '1.19']
         NODE: ['16.14']
-        CHROME: ['101', '103']
+        CHROME: ['105', '106']
 
 # Used by GitLab's compile-production-assets and compile-test-assets jobs
 gitlab-assets:
diff --git a/.gitlab/ci/kas.images.yml b/.gitlab/ci/kas.images.yml
index d97451a..3781046 100644
--- a/.gitlab/ci/kas.images.yml
+++ b/.gitlab/ci/kas.images.yml
@@ -5,7 +5,7 @@ gitlab-kas:
   variables:
     GOLANG: '1.19'
     LFS: '2.9'
-    CHROME: '101'
+    CHROME: '106'
     NODE: '14.15'
     YARN: '1.22'
     GRAPHICSMAGICK: '1.3.36'
diff --git a/scripts/lib/custom-docker-build b/scripts/lib/custom-docker-build
index 8d49b8f..9613267 100755
--- a/scripts/lib/custom-docker-build
+++ b/scripts/lib/custom-docker-build
@@ -45,18 +45,15 @@ function print_golang_args() {
 # You may need to bump the version in scripts/install-chrome.
 function print_chrome_args() {
     case "$1" in
-        99|99.0)
-            CHROME_VERSION=99.0.4844.74-1
-            ;;
-        101|101.0)
-            CHROME_VERSION=101.0.4951.64-1
-            ;;
-        103|103.0)
-            CHROME_VERSION=103.0.5060.114-1
-            ;;
         104|104.0)
             CHROME_VERSION=104.0.5112.101-1
             ;;
+        105|105.0)
+            CHROME_VERSION=105.0.5195.125-1
+            ;;
+        106|106.0)
+            CHROME_VERSION=106.0.5249.91-1
+            ;;
         *) echo "Unknown chrome version $1"; exit 1;
     esac
     printf -- "--build-arg CHROME_VERSION=%s " "$CHROME_VERSION"