diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index 0195d84a..5f9dc48b 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -2,16 +2,17 @@ # Copyright (C) 2020 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -# shellcheck source=./DownloadURL.sh +PROVISIONING_DIR="$(dirname "$0")/../../" source "${BASH_SOURCE%/*}/DownloadURL.sh" +source "$PROVISIONING_DIR"/common/unix/common.sourced.sh set -ex # This script will fetch and extract pre-buildt squish package for Linux and Mac. # Squish is need by Release Test Automation (RTA) -version="7.2.1" -qtBranch="66x" +version="8.0.0" +qtBranch="67x" installFolder="/opt" squishFolder="$installFolder/squish" preBuildCacheUrl="ci-files01-hki.ci.qt.io:/hdd/www/input/squish/jenkins_build/stable" @@ -22,11 +23,16 @@ licenseSHA="e84b499a2011f9bb1a6eefc7b2338d7ae770927a" testSuiteUrl="ci-files01-hki.ci.qt.io:/hdd/www/input/squish/coin/suite_test_squish" testSuiteLocal="/tmp/squish_test_suite" if uname -a |grep -q Darwin; then - compressedFolder="prebuild-squish-$version-$qtBranch-mac.tar.gz" - sha1="7467c974b65255c86b8fccaeca90e0590d4f7c96" + compressedFolder="prebuild-squish-$version-$qtBranch-mac-x64.tar.gz" + sha1="8ae422b44af9b8e5f0d15cdca08df99973b8699a" else - compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz" - sha1="950a6035c777c8ce0a50a0b3ad468044d07f898b" + if [ "$PROVISIONING_ARCH" = arm64 ] ; then + compressedFolder="prebuild-squish-$version-$qtBranch-linux-arm64.tar.gz" + sha1="06d542579271f88b1527d6ddca2bfd4eaf2dade5" + else + compressedFolder="prebuild-squish-$version-$qtBranch-linux-x64.tar.gz" + sha1="db5c48f359b46a460551cdf9362c63f557cbc04f" + fi fi mountFolder="/tmp/squish" @@ -69,14 +75,6 @@ if uname -a |grep -q Darwin; then sudo xattr -r -c "$squishFolder" fi -if uname -a |grep -q "Ubuntu"; then - if [ ! -e "/usr/lib/tcl8.6" ]; then - sudo mkdir /usr/lib/tcl8.6 - #this needs to be copied only to squish_for_qt65 - sudo cp "$squishFolder/squish_for_qt66/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/ - fi -fi - echo "Download Squish license" DownloadURL "$licenseUrl" "$licenseUrl" "$licenseSHA" "$HOME/$licenseFile" diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index ec4d240a..4766d2e9 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -6,8 +6,8 @@ # This script will pre-installed squish package for Windows. # Squish is need by Release Test Automation (RTA) -$version = "7.2.1" -$qtBranch = "66x" +$version = "8.0.0" +$qtBranch = "67x" $targetDir = "C:\Utils\squish" $squishPackage = "C:\Utils\rta_squish" $squishUrl = "\\ci-files01-hki.ci.qt.io\provisioning\squish\jenkins_build\stable" @@ -33,7 +33,7 @@ if (($OSVersion -eq "Windows 10 Enterprise") -or ($OSVersion -eq "Windows 10 Pro # In Windows 11 case $OSVersion is 'Windows 10 Pro' $winVersion = "win10" if (Is64BitWinHost) { - $sha1 = "eed4ed4936fbbacb11e0d8a00ff190e1ea808eeb" + $sha1 = "0f863c261f854ec38032815298f5636e99779bff" } } else { $winVersion = "n/a" diff --git a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/90-squish.sh b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/90-squish.sh new file mode 100644 index 00000000..f803ccc1 --- /dev/null +++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/90-squish.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +#Copyright (C) 2023 The Qt Company Ltd +#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/squishInstall.sh" + diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/90-squish.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/90-squish.sh new file mode 100644 index 00000000..f803ccc1 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/90-squish.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +#Copyright (C) 2023 The Qt Company Ltd +#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/squishInstall.sh" + diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/90-squish.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/90-squish.sh new file mode 100644 index 00000000..f803ccc1 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/90-squish.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +#Copyright (C) 2023 The Qt Company Ltd +#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/squishInstall.sh" + diff --git a/coin/provisioning/qtci-windows-11_22H2-aarch64/90-squish.ps1 b/coin/provisioning/qtci-windows-11_22H2-aarch64/90-squish.ps1 new file mode 100644 index 00000000..ff758845 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_22H2-aarch64/90-squish.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\squishInstall.ps1"