From 6b79db937040b9d392c2032c0be3dd34309a47f9 Mon Sep 17 00:00:00 2001
From: Andrejs Cunskis <acunskis@gitlab.com>
Date: Thu, 11 Apr 2024 17:04:18 +0000
Subject: [PATCH] Bump chrome version to 123
---
.gitlab-ci.yml | 2 +-
qa/Dockerfile | 4 +++-
scripts/build_qa_image | 2 ++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 60d752489a94..444f92fa6ff4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -184,7 +184,7 @@ variables:
BUILD_OS: "debian"
OS_VERSION: "bookworm"
UBI_VERSION: "8.6"
- CHROME_VERSION: "120"
+ CHROME_VERSION: "123"
DOCKER_VERSION: "24.0.5"
RUBYGEMS_VERSION: "3.4"
BUNDLER_VERSION: "2.5"
diff --git a/qa/Dockerfile b/qa/Dockerfile
index 54ae484e17a2..975c6edd9e2d 100644
--- a/qa/Dockerfile
+++ b/qa/Dockerfile
@@ -2,9 +2,11 @@ ARG DOCKER_VERSION=24.0.5
ARG CHROME_VERSION=119
ARG RUBY_VERSION=3.1
ARG BUNDLER_VERSION=2.5
+ARG BUILD_OS=debian
+ARG OS_VERSION=bookworm
ARG QA_BUILD_TARGET=ee
-FROM registry.gitlab.com/gitlab-org/gitlab-build-images/debian-bullseye-ruby-${RUBY_VERSION}:bundler-${BUNDLER_VERSION}-git-2.36-lfs-2.9-chrome-${CHROME_VERSION}-docker-${DOCKER_VERSION}-gcloud-383-kubectl-1.23 AS foss
+FROM registry.gitlab.com/gitlab-org/gitlab-build-images/${BUILD_OS}-${OS_VERSION}-ruby-${RUBY_VERSION}:bundler-${BUNDLER_VERSION}-git-2.36-lfs-2.9-chrome-${CHROME_VERSION}-docker-${DOCKER_VERSION}-gcloud-383-kubectl-1.23 AS foss
LABEL maintainer="GitLab Quality Department <quality@gitlab.com>"
ENV DEBIAN_FRONTEND="noninteractive"
diff --git a/scripts/build_qa_image b/scripts/build_qa_image
index eab8abd5c5cd..7a783996124b 100755
--- a/scripts/build_qa_image
+++ b/scripts/build_qa_image
@@ -88,6 +88,8 @@ docker buildx build \
--build-arg=DOCKER_VERSION="${DOCKER_VERSION}" \
--build-arg=RUBY_VERSION="${RUBY_VERSION}" \
--build-arg=BUNDLER_VERSION="${BUNDLER_VERSION}" \
+ --build-arg=BUILD_OS="${BUILD_OS}" \
+ --build-arg=OS_VERSION="${OS_VERSION}" \
--build-arg=QA_BUILD_TARGET="${QA_BUILD_TARGET}" \
--file="${CI_PROJECT_DIR}/qa/Dockerfile" \
--push \
--
GitLab