From 27b0c6daffdb4bbe513f0ae1d48b61429a37f5e2 Mon Sep 17 00:00:00 2001
From: Piotr Wiercinski <piotr.wiercinski@qt.io>
Date: Wed, 15 Jan 2025 12:48:48 +0100
Subject: [PATCH] wasm tests: Update Chrome to 131 and use headless mode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Newer version of Chrome together with healdess mode
should provide more stability.

Change-Id: Ifb6b326b90067d9e069ebef662356d28e2c9edd7
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
(cherry picked from commit ae85de3cf812686cc94a859d893c388011e2a09d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../platform_configs/cmake_platforms_wasm.yaml |  3 ++-
 .../80-install-chrome.sh                       | 18 +++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml
index 90a4a865..57d7a4c8 100644
--- a/coin/platform_configs/cmake_platforms_wasm.yaml
+++ b/coin/platform_configs/cmake_platforms_wasm.yaml
@@ -10,7 +10,8 @@ Configurations:
     Environment variables: [
         'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
         "TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread \
-         -feature-exceptions -DQT_QMAKE_DEVICE_OPTIONS=\"QT_EMSCRIPTEN_ASYNCIFY=1\""
+         -feature-exceptions -DQT_QMAKE_DEVICE_OPTIONS=\"QT_EMSCRIPTEN_ASYNCIFY=1\"",
+        'HEADLESS_CHROME_FOR_TESTING=true'
     ]
 -
     Id: 'webassembly-windows'
diff --git a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/80-install-chrome.sh b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/80-install-chrome.sh
index ba54c2c5..7901ea1a 100644
--- a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/80-install-chrome.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/80-install-chrome.sh
@@ -10,14 +10,14 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 # shellcheck source=../common/unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
 
-chromeVersion="chrome-for-testing-115"
-sha="7242ece1055bdbf503527f8e87c4b5da37c3c60e"
-chromeUrl="https://ci-files01-hki.ci.qt.io/input/wasm/chrome/${chromeVersion}.tar.gz"
-target="/tmp/chrome-for-testing-115.tar.gz"
+chromeVersion="chrome-for-testing-131"
+sha="006d8e0438980d5ca8809af6f036e2b802b13cc8"
+cachedChromeUrl="https://ci-files01-hki.ci.qt.io/input/wasm/chrome/${chromeVersion}.zip"
+officialChromeUrl="https://storage.googleapis.com/chrome-for-testing-public/131.0.6778.204/linux64/chrome-linux64.zip"
+target="/tmp/${chromeVersion}.zip"
 
-DownloadURL "$chromeUrl" "" "$sha" "$target"
-sudo tar -xzf "$target" -C "${HOME}"
+DownloadURL "$cachedChromeUrl" "$officialChromeUrl" "$sha" "$target"
+sudo unzip -q "$target" -d "${HOME}"
 sudo rm -f "$target"
-
-SetEnvVar "BROWSER_FOR_WASM" "${HOME}/${chromeVersion}/chrome"
-SetEnvVar "CHROMEDRIVER_PATH" "${HOME}/${chromeVersion}/chromedriver"
+chromePath="${HOME}/chrome-linux64/chrome"
+SetEnvVar "BROWSER_FOR_WASM" "${chromePath}"