From ab8d3fad65dbf6ab86f19bdc579df472507456e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Wierci=C5=84ski?= Date: Wed, 18 Sep 2024 10:05:06 +0200 Subject: [PATCH] Provisioning: Remove unnecessary Chrome instalation for WASM testing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-6465 Change-Id: Icec3933871800ef691361da10bd065b72b8c9bb2 Reviewed-by: Morten Johan Sørvig --- .../08-pythondev.sh | 2 +- .../80-install-chrome.sh | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/08-pythondev.sh index 7f7d867ae47..a7f487bdd94 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/08-pythondev.sh @@ -13,7 +13,7 @@ sudo zypper -nq install python-devel python-xml # install python3 sudo zypper -nq install python311-base python311-devel python311-pip python311-virtualenv python311-wheel -python3.11 -m pip install selenium netifaces scache webdriver-manager +python3.11 -m pip install selenium netifaces scache python3.11 -m pip install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" SetEnvVar "PYTHON3_EXECUTABLE" "/usr/bin/python3.11" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/80-install-chrome.sh b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/80-install-chrome.sh index ad28638f9a1..3b9d8c27fa4 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/80-install-chrome.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/80-install-chrome.sh @@ -10,21 +10,6 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" # shellcheck source=../common/unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" -# Webassembly auto tests run requires latest Chrome. Let's use the latest stable one which means we can't cache this -sudo zypper ar http://dl.google.com/linux/chrome/rpm/stable/x86_64 Google-Chrome - -# Add the Google public signing key -externalUrl="https://dl.google.com/linux/linux_signing_key.pub" -Download "$externalUrl" "/tmp/linux_signing_key.pub" -sudo rpm --import /tmp/linux_signing_key.pub - -# Update the repo cache of zypper and install Chrome -sudo zypper ref -f -sudo zypper -nq install --no-confirm google-chrome-stable - -# Install Chromedriver Chromium -sudo zypper -nq install chromedriver - chromeVersion="chrome-for-testing-115" sha="7242ece1055bdbf503527f8e87c4b5da37c3c60e" chromeUrl="https://ci-files01-hki.ci.qt.io/input/wasm/chrome/${chromeVersion}.tar.gz"