mirror of
https://ops.gitlab.net/gitlab-org/gitlab-build-images.git
synced 2025-12-10 02:22:57 +01:00
Add chrome v117 to the matrix
This commit is contained in:
parent
c91dd94d51
commit
5f2f0b0202
4 changed files with 23 additions and 11 deletions
|
|
@ -37,11 +37,21 @@ function build_debian() {
|
|||
echo "Installing webdriver"
|
||||
if [ "${ARCH}" == "amd64" ]; then
|
||||
CHROME_VERSION_BASE=$(echo $CHROME_VERSION | awk -F "." '{print $1 "." $2 "." $3}')
|
||||
CHROME_DRIVER_VERSION=$(curl -q https://chromedriver.storage.googleapis.com/LATEST_RELEASE_$CHROME_VERSION_BASE)
|
||||
CHROME_VERSION_MAJOR=$(echo $CHROME_VERSION | awk -F "." '{print $1}')
|
||||
|
||||
wget -q https://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip
|
||||
unzip chromedriver_linux64.zip -d /usr/local/bin
|
||||
rm -f chromedriver_linux64.zip
|
||||
# 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
|
||||
|
||||
wget -q -O chromedriver.zip $WEBDRIVER_URL
|
||||
unzip chromedriver.zip -d /usr/local/bin
|
||||
rm -f chromedriver.zip
|
||||
else
|
||||
DRIVER_DEB=$(download_deb driver)
|
||||
apt-get install -y "./$DRIVER_DEB"
|
||||
|
|
@ -76,7 +86,7 @@ BUILD_OS=${BUILD_OS:-debian}
|
|||
OS_VERSION=${OS_VERSION:-bullseye}
|
||||
|
||||
# When using a -slim version, actually use the non-slim OS version.
|
||||
#
|
||||
#
|
||||
# See https://gitlab.com/gitlab-org/gitlab-build-images/-/merge_requests/729#note_1564796274
|
||||
if [[ $OS_VERSION =~ .+-slim ]]; then
|
||||
OS_VERSION=${OS_VERSION%%-slim}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue