Provisioning: Temporary fix for installing Conan packages in Windows

Task-number: QTQAINFRA-4443
Change-Id: Iba4b240edaf4a3ec8732ddbe1ae4ac5c1166b676
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 99a81d0c6c)

.gitmodules

@@ -1,60 +1,60 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtsvg
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon
 [submodule "qtscript"]
 	depends = qtbase
 	recommends = qttools
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = deprecated
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = essential
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -62,7 +62,7 @@
 	recommends = qtmultimedia qtquickcontrols qtquickcontrols2
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -83,14 +83,14 @@
 	recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -123,185 +123,185 @@
 	recommends = qtdeclarative qtandroidextras
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtimageformats qtgamepad
 	path = qt3d
 	url = ../qt3d.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon
 [submodule "qtgraphicaleffects"]
 	depends = qtdeclarative
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon
 [submodule "qtquickcontrols"]
 	depends = qtdeclarative
 	recommends = qtgraphicaleffects
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon
 [submodule "qtx11extras"]
 	depends = qtbase
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon
 [submodule "qtmacextras"]
 	depends = qtbase
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon
 [submodule "qtwinextras"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon
 [submodule "qtandroidextras"]
 	depends = qtbase
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon
 [submodule "qtquickcontrols2"]
 	depends = qtgraphicaleffects
 	recommends = qtimageformats
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = essential
 [submodule "qtpurchasing"]
 	depends = qtbase
 	recommends = qtdeclarative qtandroidextras
 	path = qtpurchasing
 	url = ../qtpurchasing.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia qtquickcontrols
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
 	recommends = qtdeclarative
 	path = qtwebglplugin
 	url = ../qtwebglplugin.git
-	branch = 5.12.12
+	branch = 5.12.10
 	status = addon

coin/platform_configs/default.yaml

@@ -99,7 +99,7 @@
     Features: ['Packaging']
     Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s'
 -
-    Template: 'qtci-macos-10.13-x86_64-3'
+    Template: 'qtci-macos-10.13-x86_64-2'
     Compiler: 'Clang'
     Features: ['Packaging']
     Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -separate-debug-info -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include'
@@ -113,28 +113,28 @@
     Compiler: 'Clang'
     Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include'
 -
-    Template: 'qtci-macos-10.13-x86_64-3'
+    Template: 'qtci-macos-10.13-x86_64-2'
     Target os: 'IOS_ANY'
     Target arch: 'multi'
     Compiler: 'Clang'
     Features: ['Packaging', 'DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang'
 -
-    Template: 'qtci-macos-10.13-x86_64-3'
+    Template: 'qtci-macos-10.13-x86_64-2'
     Target os: 'TvOS_ANY'
     Target arch: 'multi'
     Compiler: 'Clang'
     Features: ['DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-tvos-clang'
 -
-    Template: 'qtci-macos-10.13-x86_64-3'
+    Template: 'qtci-macos-10.13-x86_64-2'
     Target os: 'WatchOS_ANY'
     Target arch: 'multi'
     Compiler: 'Clang'
     Features: ['DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-watchos-clang'
 -
-    Template: 'qtci-macos-10.13-x86_64-3'
+    Template: 'qtci-macos-10.13-x86_64-2'
     Target os: 'Android_ANY'
     Target arch: 'x86'
     Compiler: 'Clang'

coin/platform_configs/installer-framework.yaml

@@ -10,7 +10,7 @@ Configurations:
     Environment variables: ['TARGET_ARCHITECTURE=amd64_x86', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;']
     Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat', 'amd64_x86']
 -
-    Template: 'qtci-macos-10.13-x86_64-3'
+    Template: 'qtci-macos-10.13-x86_64-2'
     Compiler: 'Clang'
     Features: ['Packaging', 'DisableTests']
     Configure arguments: '-opensource -confirm-license -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-freetype -prefix /Users/qt/work/install'

coin/platform_configs/qt5.yaml

@@ -67,7 +67,7 @@
     Features: ['Packaging', 'DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch arm64-v8a'
 -
-    Template: 'qtci-macos-10.13-x86_64-3'
+    Template: 'qtci-macos-10.13-x86_64-2'
     Target os: 'Android_ANY'
     Target arch: 'armv7'
     Compiler: 'Clang'
@@ -75,7 +75,7 @@
     Features: ['Packaging', 'DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch armeabi-v7a'
 -
-    Template: 'qtci-macos-10.13-x86_64-3'
+    Template: 'qtci-macos-10.13-x86_64-2'
     Target os: 'Android_ANY'
     Target arch: 'arm64'
     Compiler: 'Clang'
@@ -83,7 +83,7 @@
     Features: ['Packaging', 'DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch arm64-v8a'
 -
-    Template: 'qtci-macos-10.13-x86_64-3'
+    Template: 'qtci-macos-10.13-x86_64-2'
     Target os: 'QNX_700'
     Target arch: 'x86'
     Compiler: 'GCC'

coin/provisioning/common/linux/openssl_for_android_linux.sh

@@ -41,7 +41,6 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-version="1.1.1k"
 exports_file="/tmp/export.sh"
 # source previously made environmental variables.
 if uname -a |grep -q "Ubuntu"; then
@@ -54,10 +53,11 @@ else
     rm -rf "$exports_file"
 fi
 
+version="1.1.1g"
 officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
 cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
 targetFile="/tmp/openssl-$version.tar.gz"
-sha="bad9dc4ae6dcc1855085463099b5dacb0ec6130b"
+sha="b213a293f2127ec3e323fb3cfc0c9807664fd997"
 opensslHome="${HOME}/openssl/android/openssl-${version}"
 DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
 mkdir -p "${HOME}/openssl/android/"

coin/provisioning/common/unix/install-openssl.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-version="1.1.1k"
+version="1.1.1g"
 officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
 cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
 targetFile="/tmp/openssl-$version.tar.gz"
-sha="bad9dc4ae6dcc1855085463099b5dacb0ec6130b"
+sha="b213a293f2127ec3e323fb3cfc0c9807664fd997"
 opensslHome="${HOME}/openssl-${version}"
 opensslSource="${opensslHome}-src"
 DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"

coin/provisioning/common/unix/squishInstall.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,93 +33,141 @@
 ##
 #############################################################################
 
-# shellcheck source=./DownloadURL.sh
-source "${BASH_SOURCE%/*}/DownloadURL.sh"
-
 set -ex
 
-# This script will fetch and extract pre-buildt squish package for Linux and Mac.
+# This script will install squish package for Linux and Mac.
 # Squish is need by Release Test Automation (RTA)
 
-version="6.6.1"
+version="6.4.3"
+# Branch version without dot
 qtBranch="512x"
-installFolder="/opt"
-squishFolder="$installFolder/squish"
-preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build/stable"
-licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/$qtBranch/.squish-3-license"
-licenseSHA="e000d2f95b30b82f405b9dcbeb233cd43710a41a"
+squishFolder="/opt/squish"
+squishUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/$qtBranch/"
+squishFile="squish-$version-qt$qtBranch-linux64.run"
 if uname -a |grep -q Darwin; then
-     compressedFolder="prebuild-squish-$version-$qtBranch-macx86_64.tar.gz"
-     sha1="18d683c8702ec47528e36f8e352bc64b07e7996a"
-else
-     compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz"
-     sha1="9cb84b7c8d920ced056ce94ce75b0879c29fba22"
+     squishFile="squish-$version-qt$qtBranch-macx86_64.dmg"
 fi
 
-mountFolder="/tmp/squish"
-sudo mkdir "$mountFolder"
+squishLicenseUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/"
+squishLicenseFile=".squish-3-license.tar.gz"
 
-# Check which platform
-if uname -a |grep -q Darwin; then
-    usersGroup="staff"
-    squishLicenseDir="/Users/qt"
-elif uname -a |grep -q "el7"; then
-    usersGroup="qt"
-    squishLicenseDir="/root"
-elif uname -a |grep -q "Ubuntu"; then
-    usersGroup="users"
-    squishLicenseDir="/home/qt"
-else
-    usersGroup="users"
-    squishLicenseDir="/root"
+testSuite="suite_test_squish"
+testSuiteUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/"
+
+# These checks can be removed when Vanilla OS for all linux and Mac are in
+if [ -d "$squishFolder" ]; then
+    echo "Move old squish to /tmp"
+    sudo mv "$squishFolder" "/tmp/squish_$(date)"
 fi
 
-targetFileMount="$mountFolder"/"$compressedFolder"
-
-echo "Mounting $preBuildCacheUrl to $mountFolder"
-sudo mount "$preBuildCacheUrl" "$mountFolder"
-echo "Create $installFolder if needed"
-if [ !  -d "$installFolder" ]; then
-    sudo mkdir "$installFolder"
+if [ -f "/etc/profile.d/squish_env.sh" ]; then
+    echo "Remove /etc/profile.d/squish_env.sh"
+    sudo rm -f "/etc/profile.d/squish_env.sh"
+    export SQUISH_LICENSEKEY_DIR=$HOME
 fi
 
-VerifyHash "$targetFileMount" "$sha1"
+function MountAndInstall {
+    url=$1
+    targetDirectory=$2
+    targetFile=$3
 
-echo "Uncompress $compressedFolder"
-sudo tar -xzf "$targetFileMount" --directory "$installFolder"
-
-echo "Unmounting $mountFolder"
-sudo diskutil unmount force "$mountFolder" || sudo umount -f "$mountFolder"
-
-sudo mv "$installFolder/rta_squish_$version" "$squishFolder"
-
-if uname -a |grep -q "Ubuntu"; then
-    if [ ! -e "/usr/lib/tcl8.6" ]; then
-        sudo mkdir /usr/lib/tcl8.6
-        sudo cp "$squishFolder/squish_for_qt/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/
+    # Check which platform
+    if uname -a |grep -q Darwin; then
+        usersGroup="staff"
+        mountFolder="/Volumes"
+        squishLicenseDir="/Users/qt"
+    elif uname -a |grep -q "el7"; then
+        usersGroup="qt"
+        mountFolder="/tmp"
+        squishLicenseDir="/root"
+    elif uname -a |grep -q "Ubuntu"; then
+        usersGroup="users"
+        mountFolder="/tmp"
+        squishLicenseDir="/home/qt"
+    else
+        usersGroup="users"
+        mountFolder="/tmp"
+        squishLicenseDir="/root"
     fi
-fi
 
-DownloadURL "$licenseUrl" "$licenseUrl" "$licenseSHA" "$HOME/.squish-3-license"
+    function UnMount {
+        echo "Unmounting $mountFolder"
+        sudo diskutil unmount force "$mountFolder" || sudo umount -f "$mountFolder"
+    }
 
-echo "Changing ownerships"
-sudo chown -R qt:$usersGroup "$squishFolder"
-sudo chown qt:$usersGroup "$HOME/.squish-3-license"
+    targetFileMount="$mountFolder"/"$targetFile"
+
+    echo "Mounting $url to $mountFolder"
+    sudo mount "$url" "$mountFolder"
+    echo "Create $targetDirectory if needed"
+    if [ !  -d "/opt" ]; then
+        sudo mkdir "/opt"
+    fi
+    if [ !  -d "$targetDirectory" ]; then
+        sudo mkdir "$targetDirectory"
+    fi
+    echo "Uncompress $targetFile"
+    if [[ $targetFile == *.tar.gz ]]; then
+        if [[ $targetFile == .squish-3-license.* ]]; then
+            target="$squishLicenseDir"
+            # Squish license need to be exists also in users home directory, because squish check it before it starts running tests
+            sudo tar -xzf "$targetFileMount" --directory "$HOME"
+        else
+            target="$targetDirectory"
+        fi
+        sudo tar -xzf "$targetFileMount" --directory "$target"
+        UnMount
+    elif [[ $targetFile == *.dmg ]]; then
+        echo "'dmg-file', no need to uncompress"
+        sudo cp $targetFileMount /tmp
+        UnMount
+        sudo hdiutil attach "/tmp/$targetFile"
+        sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1
+        mountFolder="/Volumes/froglogic Squish"
+        UnMount
+    elif [[ $targetFile == *.run ]]; then
+        echo "'run-file', no need to uncompress"
+        sudo cp $targetFileMount $targetDirectory
+        UnMount
+        sudo chmod +x $targetDirectory/$targetFile
+        sudo $targetDirectory/$targetFile unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1
+        sudo rm -fr "$targetDirectory/$targetFile"
+        if uname -a |grep -q "Ubuntu"; then
+            sudo mkdir /usr/lib/tcl8.6
+            sudo cp "$targetDirectory/package/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/
+        fi
+    else
+        exit 1
+    fi
+
+    echo "Changing ownerships"
+    sudo chown -R qt:$usersGroup "$targetDirectory"
+    sudo chown qt:$usersGroup "$HOME/.squish-3-license"
+}
 
 echo "Set commands for environment variables in .bashrc"
+
 if uname -a |grep -q "Ubuntu"; then
-    echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.profile
-    echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.profile
+    echo "export SQUISH_PATH=$squishFolder/package" >> ~/.profile
+    echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.profile
 else
-    echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.bashrc
-    echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.bashrc
+    echo "export SQUISH_PATH=$squishFolder/package" >> ~/.bashrc
+    echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.bashrc
 fi
 
-echo "Verifying Squish"
-if "$squishFolder/squish_for_qt/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
-    echo "Squish for Qt installation tested successfully"
+echo "Installing squish license to home directory.."
+MountAndInstall "$squishLicenseUrl" "$squishFolder" "$squishLicenseFile"
+
+echo "Installing squish $version.."
+MountAndInstall "$squishUrl" "$squishFolder" "$squishFile"
+
+echo "Installing provisioning scripts for squish"
+MountAndInstall "$testSuiteUrl" "$squishFolder" "$testSuite.tar.gz"
+
+echo "Verifying Squish Installation"
+if "$squishFolder/package/bin/squishrunner" --testsuite "$squishFolder/$testSuite" | grep "Squish test run successfully" ; then
+    echo "Squish installation tested successfully"
 else
-    echo "Squish for Qt test failed! Package wasn't installed correctly."
+    echo "Squish test failed! Package wasn't installed correctly."
     exit 1
 fi
-

coin/provisioning/common/windows/android-openssl.ps1

@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -45,57 +45,30 @@ if (Is64BitWinHost) {
 # Msys need to be installed to target machine
 # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html
 
-$version = "1.1.1k"
+$version = "1.1.1g"
 $zip = Get-DownloadLocation ("openssl-$version.tar.gz")
-$prebuilt_zip = Get-DownloadLocation ("openssl-android-master-$version.zip")
-$sha1 = "bad9dc4ae6dcc1855085463099b5dacb0ec6130b"
-$prebuilt_sha1 = "07fad2a44ffa90261a779782bd64fe2304487945"
+$sha1 = "b213a293f2127ec3e323fb3cfc0c9807664fd997"
 $destination = "C:\Utils\openssl-android-master"
-$prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-android-master-$version.zip"
 
 # msys unix style paths
 $ndkPath = "/c/Utils/Android/android-ndk-r19c"
 $openssl_path = "/c/Utils/openssl-android-master"
 $cc_path = "$ndkPath/toolchains/llvm/prebuilt/windows-x86_64/bin"
-if ((Test-Path $prebuilt_url)) {
-    Download $prebuilt_url $prebuilt_url $prebuilt_zip
-    Verify-Checksum $prebuilt_zip $prebuilt_sha1
-    Extract-7Zip $prebuilt_zip C:\Utils
-    Remove $prebuilt_zip
-} else {
-    Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip
-    Verify-Checksum $zip $sha1
+Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip
+Verify-Checksum $zip $sha1
 
-    Extract-7Zip $zip C:\Utils\tmp
-    Extract-7Zip C:\Utils\tmp\openssl-$version.tar C:\Utils\tmp
-    Move-Item C:\Utils\tmp\openssl-${version} $destination
-    Remove "$zip"
+Extract-7Zip $zip C:\Utils\tmp
+Extract-7Zip C:\Utils\tmp\openssl-$version.tar C:\Utils\tmp
+Move-Item C:\Utils\tmp\openssl-${version} $destination
+Remove-Item -Path $zip
 
-    Write-Host "Configuring OpenSSL $version for Android..."
-    Push-Location $destination
-    # $ must be escaped in powershell...
-
-    function CheckExitCode {
-
-        param (
-            $p
-        )
-
-        if ($p.ExitCode) {
-            Write-host "Process failed with exit code: $($p.ExitCode)"
-            exit 1
-        }
-    }
-
-    $configure = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"")
-    CheckExitCode $configure
-
-    $make = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"")
-    CheckExitCode $make
-
-    Pop-Location
-    Remove-item C:\Utils\tmp -Recurse -Confirm:$false
-}
+Write-Host "Configuring OpenSSL $version for Android..."
+Push-Location $destination
+# $ must be escaped in powershell...
+Start-Process -NoNewWindow -Wait -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"")
+Start-Process -NoNewWindow -Wait -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"")
+Pop-Location
 
 Set-EnvironmentVariable "OPENSSL_ANDROID_HOME" "$destination"
+Remove-item C:\Utils\tmp -Recurse -Confirm:$false
 Write-Output "Android OpenSSL = $version" >> ~/versions.txt

coin/provisioning/common/windows/disable-netadapterlso.ps1

@@ -1 +0,0 @@
-Disable-NetAdapterLso Ethernet

coin/provisioning/common/windows/openssl.ps1

@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -36,7 +36,7 @@
 # This script installs OpenSSL $version.
 # Both x86 and x64 versions needed when x86 integrations are done on x64 machine
 
-$version = "1_1_1k"
+$version = "1_1_1g"
 $packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe"
 $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe"
 
@@ -47,7 +47,7 @@ if (Is64BitWinHost) {
     $installFolder = "C:\openssl"
     $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe"
     $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe"
-    $sha1 = "ab5367a1f46a3779a870fe2c1a99e03f8ffa3041"
+    $sha1 = "7643561c372720f55de51454a707ede334db086e"
 
     Write-Host "Fetching from URL ..."
     Download $externalUrl $internalUrl $packagex64
@@ -74,7 +74,7 @@ if (Is64BitWinHost) {
 
 $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe"
 $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe"
-$sha1 = "49f5b7fe01d686f706071c9a00d19bd69f2e7371"
+$sha1 = "c7d4b096c2413d1af819ccb291214fa3c4cece07"
 
 Write-Host "Fetching from URL ..."
 Download $externalUrl $internalUrl $packagex86

coin/provisioning/common/windows/python.ps1

@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2016 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -54,30 +54,8 @@ $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\python-$versio
 Write-Host "Fetching from URL..."
 Download $externalUrl $internalUrl $package
 Verify-Checksum $package $sha1
-
-# Python installation is flaky, but seems to pass with second run if error occurs.
-$stop = $false
-[int]$retry = "0"
-do {
-    try {
-        # /levx = e:'All error messages' v:'Verbose' x:'Extra debugging info'
-        Run-Executable "msiexec" "/passive /i $package /levx C:\Windows\Temp\Python_log.log TARGETDIR=$targetDir ALLUSERS=1"
-        $stop = $true
-    }
-    catch {
-        Get-Content C:\Windows\Temp\Python_log.log -Tail 50
-        if ($retry -gt 2) {
-        Write-Host "Python installation failed!"
-        throw
-        }
-        else {
-            Write-Host "Couldn't install python, retrying in 30 seconds"
-            Start-Sleep -s 30
-            $retry = $retry + 1
-        }
-    }
-}
-while ($stop -ne $true)
+Write-Host "Installing $package..."
+Run-Executable "msiexec" "/passive /i $package TARGETDIR=$targetDir ALLUSERS=1"
 
 # We need to change allowZip64 from 'False' to 'True' to be able to create ZIP files that use the ZIP64 extensions when the zipfile is larger than 2 GB
 Write-Host "Changing allowZip64 value to 'True'..."

coin/provisioning/common/windows/squishInstall.ps1

@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,48 +33,122 @@
 
 . "$PSScriptRoot\helpers.ps1"
 
-# This script will pre-installed squish package for Windows.
+# This script will install squish package for Windows.
 # Squish is need by Release Test Automation (RTA)
+# NOTE! Make sure 64bit versions are always installed before 32bit,
+# because they use same folder name before a rename
 
-$version = "6.6.1"
+$version = "6.4.3"
+
+# Qt branch without dot (*.*)
 $qtBranch = "512x"
+# So far Squish built with Qt5.12 works also with 5.13, but we have to be prepared that on some point
+# the compatibility breaks, and we may need to have separate Squish packages for different Qt versions.
+
 $targetDir = "C:\Utils\squish"
-$squishPackage = "C:\Utils\rta_squish"
-$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable"
-$licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin"
+$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin"
+$squishBranchUrl = "$squishUrl\$qtBranch"
+$testSuite = "suite_test_squish"
+$testSuiteUrl = "$squishUrl\$testSuite.7z"
 
 # Squish license
 $licensePackage = ".squish-3-license"
 
-Write-Host "Installing Squish license to home directory"
-Copy-Item $licenseUrl\$licensePackage ~\$licensePackage
-
-if (Is64BitWinHost) {
-     $arch = "x64"
-} else {
-    $arch = "x86"
-}
-
 $OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -Name ProductName).ProductName
 
-if ($OSVersion -eq "Windows 10 Enterprise") {
-    $winVersion = "win10"
-    if (Is64BitWinHost) {
-        $sha1 = "13cb5b6a71d915213fac4273c99c83406b03985f"
-    } else {
-        $sha1 = "33484220762110b2fce1a1f9042f27358cb23929"
+Function DownloadAndInstallSquish {
+    Param (
+        [string]$version,
+        [string]$bit,
+        [string]$squishPackage
+    )
+    # MinGW x86 available only with Qt5.11, to be updated when Squish is supporting 5.13
+    if ("$bit" -eq "win32" -and $squishPackage.StartsWith("mingw")) {
+        $qtBranch = "511x"
+    }
+    $SquishUrl = $squishBranchUrl + "\squish-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe"
+    $SquishInstaller = "$targetDir\$squishPackage.exe"
+    $SquishParameters = "unattended=1 targetdir=$targetDir\$squishPackage"
+
+    Write-Host "Fetching from URL $squishUrl"
+    Copy-Item "$SquishUrl" "$SquishInstaller"
+    Write-Host "Installing Squish"
+    Run-Executable "$SquishInstaller" "$SquishParameters"
+    Remove-Item -Path $SquishInstaller
+    if ("$bit" -eq "win64") {
+        if ($squishPackage.StartsWith("mingw")) {
+            $squishPackage64bit = "mingw_64"
+        } else {
+            $squishPackage64bit = "$squishPackage`_64"
+        }
+        Rename-Item $targetDir\$squishPackage $targetDir\$squishPackage64bit
+        TestSquish $squishPackage64bit
+    } else {
+        if ($squishPackage.StartsWith("mingw")) {
+            Rename-Item $targetDir\$squishPackage $targetDir\mingw
+            TestSquish mingw
+        } else {
+            TestSquish $squishPackage
+        }
     }
-} elseif ($OSVersion -eq "Windows 7 Enterprise") {
-    $winVersion = "win7"
-    $sha1 = "05d6255b090eace35cf1e899ea203e9182cccccd"
 }
-$squishArchive = "prebuild-squish-$version-$qtBranch-$winVersion-$arch.zip"
 
-Copy-Item "$squishUrl\$squishArchive" "C:\Utils"
-Verify-Checksum "C:\Utils\$squishArchive" $sha1
-Extract-7Zip "C:\Utils\$squishArchive" "C:\Utils"
-Rename-Item "$squishPackage" "$targetDir"
+Function DownloadSquishLicence {
+    Param (
+        [string]$squishUrl
+    )
 
-Write-Host "Verifying Squish Installation for following targets:"
-get-childitem "$targetDir" -Filter squishrunner.exe -Recurse | % { $_.FullName }
-get-childitem "$targetDir" -Filter squishrunner.exe -Recurse | % { if (cmd /c $_.FullName --testsuite "$targetDir\suite_test_squish" |Select-String -Pattern "Squish test run successfully") { Write-Host "Squish tested successfully"} else { [Environment]::Exit(1) } }
+    Write-Host "Installing Squish license to home directory"
+    Copy-Item $squishUrl\$licensePackage ~\$licensePackage
+}
+
+Function TestSquish {
+    Param (
+        [string]$squishPackage
+    )
+
+    Write-Host "Verifying Squish Installation"
+    if (cmd /c "$targetDir\$squishPackage\bin\squishrunner.exe --testsuite $targetDir\$testSuite" |Select-String -Pattern "Squish test run successfully") {
+        Write-Host "Squish installation tested successfully!"
+    } else {
+        Write-Host "Squish test failed! $squishPackage wasn't installed correctly."
+        [Environment]::Exit(1)
+    }
+}
+
+Write-Host "Creating $targetDir"
+New-Item -ErrorAction Ignore -ItemType directory -Path "$targetDir"
+
+Write-Host "Download and install Test Suite for squish"
+Copy-Item $testSuiteUrl $targetDir/$testSuite.7z
+Extract-7Zip $targetDir/$testSuite.7z $targetDir
+
+DownloadSquishLicence $squishUrl
+
+if ($OSVersion -eq "Windows 10 Enterprise") {
+
+    if (Is64BitWinHost) {
+        DownloadAndInstallSquish $version win64 "msvc14"
+        DownloadAndInstallSquish $version win64 "msvc141"
+        DownloadAndInstallSquish $version win64 "mingw_gcc73_posix_seh"
+    } else {
+        DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
+    }
+    DownloadAndInstallSquish $version win32 "msvc141"
+
+} elseif ($OSVersion -eq "Windows 8.1 Enterprise") {
+
+    if (Is64BitWinHost) {
+        DownloadAndInstallSquish $version win64 "msvc14"
+    }
+    DownloadAndInstallSquish $version win32 "msvc141"
+
+} elseif ($OSVersion -eq "Windows 7 Enterprise") {
+
+    if (Is64BitWinHost) {
+        DownloadAndInstallSquish $version win64 "msvc14"
+    } else {
+        DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
+    }
+    DownloadAndInstallSquish $version win32 "msvc141"
+}

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/04-install-packages.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -44,5 +44,3 @@ installPackages+=(openssl-devel)
 
 sudo yum -y install "${installPackages[@]}"
 
-gccVersion="$(gcc --version |grep gcc |cut -b 11-16)"
-echo "GCC = $gccVersion" >> versions.txt

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh

@@ -125,9 +125,6 @@ sudo ln -s /opt/rh/rh-python36/root/usr/bin/pip3 /usr/local/bin/pip3
 sudo pip install --upgrade "pip < 21.0"
 sudo pip install virtualenv wheel
 
-# Needed by packaging scripts
-sudo /usr/local/bin/pip3 install colorlog --user
-
 sudo /usr/local/bin/pip3 install wheel
 # Install all needed packages in a special wheel cache directory
 /usr/local/bin/pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
@@ -135,7 +132,3 @@ sudo /usr/local/bin/pip3 install wheel
 # shellcheck source=../common/unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
-
-gccVersion="$(gcc --version |grep gcc |cut -b 11-16)"
-echo "GCC = $gccVersion" >> versions.txt
-

coin/provisioning/qtci-linux-SLES-12-x86_64/02-zypperpackages.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -94,5 +94,3 @@ sudo zypper -nq install libfreetds freetds-devel
 # sqlite2 support
 sudo zypper -nq install sqlite2 sqlite2-devel
 
-gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
-echo "GCC = $gccVersion" >> versions.txt

coin/provisioning/qtci-linux-SLES-12-x86_64/08-pythondev.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -41,45 +41,12 @@ set -ex
 
 sudo zypper -nq install python-devel
 
-# Selected installation instructions coming from:
-# https://raw.githubusercontent.com/linux-on-ibm-z/scripts/master/Python3/build_python3.sh
-export PACKAGE_NAME="python"
-export PACKAGE_VERSION="3.7.2"
-(
+wget -q https://raw.githubusercontent.com/linux-on-ibm-z/scripts/master/Python3/build_python3.sh
+sed -i 's/12.3/12.4/g' build_python3.sh
+bash build_python3.sh
 
-    sudo zypper install -y  gcc gcc-c++ make ncurses patch wget tar zlib-devel zlib libffi-devel libopenssl-devel
-
-    printf -- 'Configuration and Installation started \n'
-
-    #Downloading Source code
-    wget "https://www.python.org/ftp/${PACKAGE_NAME}/${PACKAGE_VERSION}/Python-${PACKAGE_VERSION}.tar.xz"
-    tar -xvf "Python-${PACKAGE_VERSION}.tar.xz"
-
-    #Configure and Build
-    cd "Python-${PACKAGE_VERSION}"
-    ./configure --prefix=/usr/local --exec-prefix=/usr/local
-    make
-    sudo make install
-
-    export PATH="/usr/local/bin:${PATH}"
-    printf -- '\nInstalled python successfully \n'
-
-    #Cleanup
-    cd -
-    rm "Python-${PACKAGE_VERSION}.tar.xz"
-
-    #Verify python installation
-    if command -V "$PACKAGE_NAME"${PACKAGE_VERSION:0:1} >/dev/null
-    then
-        printf -- "%s installation completed. Please check the Usage to start the service.\n" "$PACKAGE_NAME"
-    else
-        printf -- "Error while installing %s, exiting with 127 \n" "$PACKAGE_NAME"
-        exit 127
-    fi
-)
-
-
-python3 --version | fgrep "$PACKAGE_VERSION"
+export
+python3 --version
 
 pip3 install --user wheel
 pip3 install --user virtualenv

coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -95,12 +95,3 @@ sudo zypper -nq install unixODBC-devel unixODBC
 # sqlite support
 sudo zypper -nq install sqlite3 sqlite3-devel
 
-# Java - needed by RTA jenkins
-sudo zypper -nq install java
-
-# open-vm-tools requires update. Version in tier1 is broken and causes segfault on boot.
-sudo zypper -nq update open-vm-tools
-
-gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
-echo "GCC = $gccVersion" >> versions.txt
-

coin/provisioning/qtci-linux-Ubuntu-16.04-x86/02-apt.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -56,5 +56,3 @@ sudo apt-get update
 echo "Installing packages"
 sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}"
 
-gccVersion="$(gcc --version |grep gcc |cut -b 13-17)"
-echo "GCC = $gccVersion" >> versions.txt

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -186,6 +186,3 @@ pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/sh
 # shellcheck source=../common/unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
-
-gccVersion="$(gcc --version |grep gcc |cut -b 13-17)"
-echo "GCC = $gccVersion" >> versions.txt

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh

@@ -67,6 +67,3 @@ sudo zypper -nq install libpulse-devel
 
 # cups
 sudo zypper -nq install cups-devel
-
-gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
-echo "GCC = $gccVersion" >> versions.txt

coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -97,16 +97,4 @@ echo "Set Network Test Server address to $NTS_IP in /etc/hosts"
 echo "$NTS_IP    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
 
 sudo systemsetup settimezone GMT
-# Setting Time Zone seems to be flaky in macOS 10.13. Checking that Time Zone is correct. If not, reset it.
-if [[ $(sudo systemsetup -gettimezone) = *GMT* ]]; then
-    echo "Time Zone is GMT"
-else
-    echo "Wrong Time Zone. Reset Time Zone to GMT"
-    sleep 5
-    sudo systemsetup settimezone GMT
-        if [[ $(sudo systemsetup -gettimezone) != *GMT* ]]; then
-            echo "Couldn't set Time Zone!"
-            exit 1
-        fi
-fi
 sudo rm -f "$targetFile"

coin/provisioning/qtci-macos-10.14-x86_64/30-nodejs.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/macos/nodejs.sh"

coin/provisioning/qtci-windows-10-x86/00-disable-netadapterlso.ps1

@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows\disable-netadapterlso.ps1"

coin/provisioning/qtci-windows-10-x86/01-enable-guest-logon.ps1

@@ -1,2 +0,0 @@
-# Allow SMB client guest logons to SMB server.
-reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /V AllowInsecureGuestAuth /T REG_dWORD /D 1 /F

coin/provisioning/qtci-windows-10-x86_64/00-disable-netadapterlso.ps1

@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows\disable-netadapterlso.ps1"

coin/provisioning/qtci-windows-10-x86_64/01-disable-runtimebroker.ps1

@@ -1,4 +0,0 @@
-# Disable RunTime Broker
-# The RunTime Broker is a Windows system process, which helps to manage app permissions on your pc between Windows apps and ensures apps are behaving themselves.
-# Coordinates execution of background work for WinRT application. If this service is stopped or disabled, then background work might not be triggered.
-reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\TimeBrokerSvc" /V Start /T REG_dWORD /D 4 /F

coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1

@@ -1,8 +1,7 @@
-#!/usr/bin/env bash
-
 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2017 Pelagicore AG
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,18 +32,13 @@
 ##
 #############################################################################
 
-# shellcheck source=./../unix/DownloadURL.sh
-source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
 
-# This script will install Nodejs
+# Signing tools are needed to sign offline installers when releasing
 
-version="14.16.1"
-urlCache="http://ci-files01-hki.ci.local/input/nodejs/node-v$version.pkg"
-urlOffcial="https://nodejs.org/dist/v$version/node-v$version.pkg"
-sha1="4720274971c40fe51b2c647060f77c45fb4949a7"
-
-DownloadURL $urlCache $urlOffcial $sha1 "/tmp/node-v$version.pkg"
-sudo installer -pkg "/tmp/node-v$version.pkg" -target /
-
- echo "Nodejs = $version" >> ~/versions.txt
+$url = "http://ci-files01-hki.intra.qt.io/input/semisecure/sign/sign.zip"
+$destination = "C:\Windows\temp\sign.zip"
 
+Download $url $url $destination
+Extract-7Zip "$destination" "C:\Utils"
+Remove-Item -Path "$destination"

coin/provisioning/qtci-windows-8.1-x86/00-disable-netadapterlso.ps1

@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows\disable-netadapterlso.ps1"

coin/provisioning/qtci-windows-8.1-x86_64/00-disable-netadapterlso.ps1

@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows\disable-netadapterlso.ps1"