diff --git a/.gitlab/ci/version.yml b/.gitlab/ci/version.yml index ed25fef390f93556aaa0af991d58099a89876590..4469abb9a7245b4c9c98cf00d590f47a4854670c 100644 --- a/.gitlab/ci/version.yml +++ b/.gitlab/ci/version.yml @@ -1,6 +1,6 @@ variables: BUILD_OS: "debian" - CHROME_VERSION: "123" + CHROME_VERSION: "138" DOCKER_VERSION: "27.4.1" EXIFTOOL_VERSION: "12.60" GCLOUD_VERSION: "413" diff --git a/qa/Dockerfile b/qa/Dockerfile index 63d08e6468175eca9299140bbf82ecb1b569cca3..91efe55a9bd3c5a587270ca84a32a101afbbb200 100644 --- a/qa/Dockerfile +++ b/qa/Dockerfile @@ -1,5 +1,5 @@ ARG BUILD_OS=debian -ARG CHROME_VERSION=123 +ARG CHROME_VERSION=138 ARG DOCKER_VERSION=24.0.5 ARG GCLOUD_VERSION=413 ARG GIT_VERSION=2.45 diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb index 2449ec2807535b472b90dd3ce6f6a961ce143ad8..15703edc0d4450114fd9e77097053e5dc734733a 100644 --- a/spec/support/capybara.rb +++ b/spec/support/capybara.rb @@ -64,7 +64,10 @@ options.add_argument("disable-dev-shm-usage") if ENV['CI'] || ENV['CI_SERVER'] # Explicitly set user-data-dir to prevent crashes. See https://gitlab.com/gitlab-org/gitlab-foss/issues/58882#note_179811508 - options.add_argument("user-data-dir=/tmp/chrome") if ENV['CI'] || ENV['CI_SERVER'] + if ENV['CI'] || ENV['CI_SERVER'] + unique_dir = "/tmp/chrome_#{Process.pid}" + options.add_argument("user-data-dir=#{unique_dir}") + end # Set chrome default download path if ENV['DEFAULT_CHROME_DOWNLOAD_PATH']