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

Add chrome v123 to e2e and gitlab images

Browse source
This commit is contained in:
Andrejs Cunskis 2024-04-10 14:02:41 +00:00 • committed by Rémy Coutable
parent 19ce50799c
commit ec3390307a
4 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,7 +24,7 @@ e2e:
- .e2e - .e2e
parallel: parallel:
matrix: matrix:
- OS: ["debian:bullseye", "debian:bookworm"] - OS: ["debian:bookworm"]
RUBY: ['3.0', '3.1', '3.2'] RUBY: ['3.0', '3.1', '3.2']
BUNDLER: ['2.4', '2.5'] BUNDLER: ['2.4', '2.5']
@ -41,10 +41,10 @@ e2e-chrome:
- e2e-docker - e2e-docker
parallel: parallel:
matrix: matrix:
- OS: ["debian:bullseye", "debian:bookworm"] - OS: ["debian:bookworm"]
RUBY: ['3.0', '3.1', '3.2'] RUBY: ['3.0', '3.1', '3.2']
BUNDLER: ['2.4', '2.5'] BUNDLER: ['2.4', '2.5']
CHROME: ['120'] CHROME: ['120', '123']
e2e-cng: e2e-cng:
extends: extends:
@ -60,7 +60,7 @@ e2e-cng:
- OS: ['debian:bookworm'] - OS: ['debian:bookworm']
RUBY: ['3.0', '3.1', '3.2'] RUBY: ['3.0', '3.1', '3.2']
BUNDLER: ['2.5'] BUNDLER: ['2.5']
CHROME: ['120'] CHROME: ['120', '123']
# Image used for running full e2e test suite # Image used for running full e2e test suite
e2e-full: e2e-full:

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

@ -46,7 +46,7 @@ gitlab:
RUBY: ['3.0.patched', '3.1.patched', '3.2.patched'] RUBY: ['3.0.patched', '3.1.patched', '3.2.patched']
POSTGRESQL: ['13', '14', '15', '16'] POSTGRESQL: ['13', '14', '15', '16']
GOLANG: ['1.20', '1.21', '1.22'] GOLANG: ['1.20', '1.21', '1.22']
CHROME: ['120'] CHROME: ['120', '123']
# Used by GitLab's compile-production-assets and compile-test-assets jobs # Used by GitLab's compile-production-assets and compile-test-assets jobs
gitlab-assets: gitlab-assets:

2
scripts/install-chrome
View file

@ -39,7 +39,7 @@ function build_debian() {
CHROME_VERSION_BASE=$(echo $CHROME_VERSION | awk -F "." '{print $1 "." $2 "." $3}') CHROME_VERSION_BASE=$(echo $CHROME_VERSION | awk -F "." '{print $1 "." $2 "." $3}')
CHROME_VERSION_MAJOR=$(echo $CHROME_VERSION | awk -F "." '{print $1}') 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) 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 wget -q -O chromedriver.zip $WEBDRIVER_URL
unzip -j chromedriver.zip -d /usr/local/bin unzip -j chromedriver.zip -d /usr/local/bin

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

@ -97,6 +97,10 @@ function print_chrome_args() {
CHROME_VERSION=120.0.6099.216-1 CHROME_VERSION=120.0.6099.216-1
CHROMIUM_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" ;; *) fail "Unknown chrome version $1" ;;
esac esac
printf -- "--build-arg CHROME_VERSION=%s " "$CHROME_VERSION" printf -- "--build-arg CHROME_VERSION=%s " "$CHROME_VERSION"