NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-08 17:42:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'remove-legacy-chrome' into 'master'

Browse source 
Remove old chrome versions and add chrome 120

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

Merged-by: Rémy Coutable <remy@rymai.me>
Approved-by: Rémy Coutable <remy@rymai.me>
Reviewed-by: Rémy Coutable <remy@rymai.me>
Reviewed-by: Andrejs Cunskis <acunskis@gitlab.com>
Co-authored-by: Andrejs Cunskis <acunskis@gitlab.com>
This commit is contained in:
Rémy Coutable 2024-01-10 14:41:22 +00:00
commit 5cc9de6b26
5 changed files with 9 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitlab/ci/cng-images.yml
View file

@ -2,7 +2,7 @@
.gitlab-cng-matrix:
variables:
LFS: '2.9'
CHROME: '109'
CHROME: '119'
NODE: '18.17'
YARN: '1.22'
GRAPHICSMAGICK: '1.3.36'

2
.gitlab/ci/e2e.images.yml
View file

@ -42,7 +42,7 @@ e2e-chrome:
matrix:
- RUBY: ['3.0', '3.1', '3.2']
BUNDLER: ['2.4', '2.5']
CHROME: ['117', '119']
CHROME: ['119', '120']
# Image used for running full e2e test suite
e2e-full:

2
.gitlab/ci/gitlab.images.yml
View file

@ -45,7 +45,7 @@ gitlab:
GOLANG: ['1.19', '1.20', '1.21']
RUST: ['1.73']
NODE: ['18.17']
CHROME: ['117', '119']
CHROME: ['119', '120']
# Used by GitLab's compile-production-assets and compile-test-assets jobs
gitlab-assets:

12
scripts/install-chrome
View file

@ -38,16 +38,8 @@ function build_debian() {
if [ "${ARCH}" == "amd64" ]; then
CHROME_VERSION_BASE=$(echo $CHROME_VERSION | awk -F "." '{print $1 "." $2 "." $3}')
CHROME_VERSION_MAJOR=$(echo $CHROME_VERSION | awk -F "." '{print $1}')
# Chromedriver location has moved starting with v115
# TODO: Remove once oldest supported version across installs is > 114
if [ "$CHROME_VERSION_MAJOR" -gt "114" ]; then
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
else
CHROME_DRIVER_VERSION=$(curl -q https://chromedriver.storage.googleapis.com/LATEST_RELEASE_$CHROME_VERSION_BASE)
WEBDRIVER_URL=https://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip
fi
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
wget -q -O chromedriver.zip $WEBDRIVER_URL
unzip -j chromedriver.zip -d /usr/local/bin

20
scripts/lib/custom-docker-build
View file

@ -84,22 +84,6 @@ function print_rust_args() {
# Chromium version can sometimes lag behind so the versions have to be defined separately
function print_chrome_args() {
case "$1" in
109|109.0)
CHROME_VERSION=109.0.5414.119-1
CHROMIUM_VERSION=109.0.5414.74-2
;;
110|110.0)
CHROME_VERSION=110.0.5481.177-1
CHROMIUM_VERSION=$CHROME_VERSION
;;
111|111.0)
CHROME_VERSION=111.0.5563.64-1
CHROMIUM_VERSION=$CHROME_VERSION
;;
113|113.0)
CHROME_VERSION=113.0.5672.126-1
CHROMIUM_VERSION=$CHROME_VERSION
;;
117|117.0)
CHROME_VERSION=117.0.5938.92-1
CHROMIUM_VERSION=117.0.5938.62-1
@ -108,6 +92,10 @@ function print_chrome_args() {
CHROME_VERSION=119.0.6045.159-1
CHROMIUM_VERSION=119.0.6045.159-1
;;
120|120.0)
CHROME_VERSION=120.0.6099.199-1
CHROMIUM_VERSION=120.0.6099.199-1
;;
*) fail "Unknown chrome version $1" ;;
esac
printf -- "--build-arg CHROME_VERSION=%s " "$CHROME_VERSION"