Merge branch 'fix-chromedriver-path' into 'master'

Extract chromedriver directly to bin folder

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

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: Andrejs Cunskis <acunskis@gitlab.com>
This commit is contained in:
Balasankar 'Balu' C 2024-01-10 10:23:40 +00:00
commit 038e54fb88
2 changed files with 10 additions and 2 deletions

View file

@ -6,6 +6,14 @@
- !reference [.build_dynamic_image, rules]
- changes:
- "scripts/lib/custom-docker-build"
- "scripts/install-chrome"
- "scripts/install-docker"
- "scripts/install-essentials"
- "scripts/install-gcloud"
- "scripts/install-git"
- "scripts/install-kubectl"
- "scripts/install-lfs"
- "scripts/install-ruby"
- ".gitlab/ci/e2e.images.yml"
# Base image with just ruby and bundler
@ -34,7 +42,7 @@ e2e-chrome:
matrix:
- RUBY: ['3.0', '3.1', '3.2']
BUNDLER: ['2.4', '2.5']
CHROME: ['113', '117', '119']
CHROME: ['117', '119']
# Image used for running full e2e test suite
e2e-full:

View file

@ -50,7 +50,7 @@ function build_debian() {
fi
wget -q -O chromedriver.zip $WEBDRIVER_URL
unzip chromedriver.zip -d /usr/local/bin
unzip -j chromedriver.zip -d /usr/local/bin
rm -f chromedriver.zip
else
DRIVER_DEB=$(download_deb driver)