From 71043ca2438d49c1f9aa64b56cfd453dac384696 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 4 May 2020 10:33:12 +0300 Subject: Provisioning: Update expired QNX license Task-number: QTQAINFRA-3708 Change-Id: Id2d6d10d88fc50c9985014c44df0b1cf51cc3410 Reviewed-by: Jani Heikkinen --- coin/provisioning/common/linux/qnx_700.sh | 4 ++-- coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh | 2 +- coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh | 4 ++-- coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'coin') diff --git a/coin/provisioning/common/linux/qnx_700.sh b/coin/provisioning/common/linux/qnx_700.sh index 02cd57d3..f344c275 100755 --- a/coin/provisioning/common/linux/qnx_700.sh +++ b/coin/provisioning/common/linux/qnx_700.sh @@ -41,8 +41,8 @@ set -ex source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" targetFolder="/opt/" -sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-linux.tar.xz" -sha1="a278234bf38cc70ead98fc0a8d2e63070fb69621" +sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-2-linux.tar.xz" +sha1="9fb115b2c84b8e7b6016a51cc421a763bda298a1" folderName="qnx700" targetFile="qnx700.tar.xz" wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh b/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh index d2905e9d..7552c5ad 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh @@ -36,7 +36,7 @@ # This script installs QNX 7. targetFolder="/opt/" -sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-macos.tar.xz" +sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz" folderName="qnx700" sudo mkdir -p "$targetFolder" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh b/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh index a5547972..7552c5ad 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh @@ -36,13 +36,13 @@ # This script installs QNX 7. targetFolder="/opt/" -sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700_mac.zip" +sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz" folderName="qnx700" sudo mkdir -p "$targetFolder" echo "Extracting QNX 7" -sudo unzip -q "$sourceFile" -d "$targetFolder" +sudo tar -C "$targetFolder" -Jxf $sourceFile sudo chown -R qt:wheel "$targetFolder"/"$folderName" diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 index b7a5230c..49b71837 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 @@ -36,10 +36,10 @@ # This script installs QNX SDP 7.0 $zip = Get-DownloadLocation "qnx700.7z" -$url = "http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-windows.7z" +$url = "http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-2-windows.7z" Download $url $url $zip -Verify-Checksum $zip "59c681466ff78f64b98b16a95b0b44650a729dfd" +Verify-Checksum $zip "1f10e9660efc81b18cb897871ba2b0384cf0fc6d" Extract-7Zip $zip C:\ Set-EnvironmentVariable "QNX_700" "C:\QNX700" -- cgit v1.2.3 From 8f653ce4f81887e574241823caf6065ec67a13b6 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 28 Apr 2020 14:53:47 +0300 Subject: Provisioning: Add sleep before killing gpg-agent in msys installation Task-number: QTQAINFRA-3691 Change-Id: If84fd2d0d1cd6dccadf21cbf688aca6182cdd920 (cherry picked from commit 5f03b84e6542f00cf9eccd1d8820f423cee5e2b9) Reviewed-by: Jani Heikkinen --- coin/provisioning/common/windows/install-msys2.ps1 | 3 +++ 1 file changed, 3 insertions(+) (limited to 'coin') diff --git a/coin/provisioning/common/windows/install-msys2.ps1 b/coin/provisioning/common/windows/install-msys2.ps1 index b26df151..784b09dc 100644 --- a/coin/provisioning/common/windows/install-msys2.ps1 +++ b/coin/provisioning/common/windows/install-msys2.ps1 @@ -66,6 +66,9 @@ cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacma Start-Sleep -s 30 cmd /c "$msys `"-l`" `"-c`" `"cpan -i Text::Template Test::More`"" +# Sometimes gpg-agent won't get killed after the installation process. If that happens the provisioning will won't continue and it will hang until timeout. So we need make sure it will be killed. +# Let's sleep for awhile and wait that msys installation is finished. Otherwise the installation might start up gpg-agent or dirmngr after the script has passed the killing process. +Start-Sleep -s 180 if (Get-Process -Name "gpg-agent" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name gpg-agent } if (Get-Process -Name "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr } -- cgit v1.2.3 From 9deba571f95c42f69f8487f4d203d5920ac2dcc7 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 4 May 2020 15:03:58 +0200 Subject: Temporarily disable QNX builds because license expiry issue Task-number: QTQAINFRA-3708 Change-Id: I676ad2e519ab527e079648d41a1ff015a2a17657 Reviewed-by: Alexandru Croitor --- coin/platform_configs/default.yaml | 7 ------ coin/platform_configs/qt5.yaml | 45 -------------------------------------- 2 files changed, 52 deletions(-) (limited to 'coin') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 553232bd..984bec61 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -140,10 +140,3 @@ Configurations: Compiler: 'GCC' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -xplatform integrity-armv7-imx6' -- - Template: 'qtci-linux-RHEL-7.6-x86_64' - Target os: 'QNX_700' - Target arch: 'armv7' - Compiler: 'GCC' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -no-sql-mysql -qpa qnx -xplatform qnx-armle-v7-qcc' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index a0b69657..1e49118c 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -55,51 +55,6 @@ Configurations: Target compiler: 'Clang' 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-r20 -android-ndk-host darwin-x86_64' -- - Template: 'qtci-macos-10.13-x86_64-2' - Target os: 'QNX_700' - Target arch: 'x86' - Compiler: 'GCC' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -extprefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc' -- - Template: 'qtci-windows-10-x86_64-17' - Target os: 'QNX_700' - Target arch: 'armv7' - Compiler: 'Mingw' - Environment variables: ['PATH=C:\Program Files\Git\bin;C:\MINGW810\mingw64\bin;$PATH;C:\qnx700\host\win64\x86_64\usr\bin;C:\qnx700\.qnx\bin', 'MAKEFLAGS=-j4 -Ic:\qnx700\target\qnx7\usr\include', 'QNX_CONFIGURATION=c:/qnx700/.qnx', 'QNX_CONFIGURATION_EXCLUSIVE=c:/qnx700/.qnx', 'QNX_TARGET=c:/qnx700/target/qnx7', 'QNX_HOST=c:/qnx700/host/win64/x86_64', 'LIB=""', 'INCLUDE=""'] - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc' -- - Template: 'qtci-windows-10-x86_64-17' - Target os: 'QNX_700' - Target arch: 'armv8' - Compiler: 'Mingw' - Environment variables: ['PATH=C:\Program Files\Git\bin;C:\MINGW810\mingw64\bin;$PATH;C:\qnx700\host\win64\x86_64\usr\bin;C:\qnx700\.qnx\bin', 'MAKEFLAGS=-j4 -Ic:\qnx700\target\qnx7\usr\include', 'QNX_CONFIGURATION=c:/qnx700/.qnx', 'QNX_CONFIGURATION_EXCLUSIVE=c:/qnx700/.qnx', 'QNX_TARGET=c:/qnx700/target/qnx7', 'QNX_HOST=c:/qnx700/host/win64/x86_64', 'LIB=""', 'INCLUDE=""'] - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc' -- - Template: 'qtci-windows-10-x86_64-17' - Target os: 'QNX_700' - Target arch: 'x86_64' - Compiler: 'Mingw' - Environment variables: ['PATH=C:\Program Files\Git\bin;C:\MINGW810\mingw64\bin;$PATH;C:\qnx700\host\win64\x86_64\usr\bin;C:\qnx700\.qnx\bin', 'MAKEFLAGS=-j4 -Ic:\qnx700\target\qnx7\usr\include', 'QNX_CONFIGURATION=c:/qnx700/.qnx', 'QNX_CONFIGURATION_EXCLUSIVE=c:/qnx700/.qnx', 'QNX_TARGET=c:/qnx700/target/qnx7', 'QNX_HOST=c:/qnx700/host/win64/x86_64', 'LIB=""', 'INCLUDE=""'] - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-x86-64-qcc' -- - Template: 'qtci-linux-RHEL-7.6-x86_64' - Target os: 'QNX_700' - Target arch: 'armv8' - Compiler: 'GCC' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-aarch64le-qcc' -- - Template: 'qtci-linux-RHEL-7.6-x86_64' - Target os: 'QNX_700' - Target arch: 'x86_64' - Compiler: 'GCC' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc' - Template: 'qtci-windows-10-x86_64-17' Target os: 'WebAssembly' -- cgit v1.2.3 From 48ff0140deed43b70c4efe53315fb15ea5e9cdfb Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 22 Apr 2020 14:15:54 +0300 Subject: Provisioning: Disable windows defender firewall MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Service is still running. It need to be disabled. Change-Id: I4742f97c93d118a1a98b4107f1597d332c3f1391 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/windows/disable-windows-defender-firewall.ps1 | 1 + .../qtci-windows-10-x86/01-disable-windows-defender-firewall.ps1 | 2 ++ .../qtci-windows-10-x86_64/01-disable-windows-defender-firewall.ps1 | 2 ++ 3 files changed, 5 insertions(+) create mode 100644 coin/provisioning/common/windows/disable-windows-defender-firewall.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/01-disable-windows-defender-firewall.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-defender-firewall.ps1 (limited to 'coin') diff --git a/coin/provisioning/common/windows/disable-windows-defender-firewall.ps1 b/coin/provisioning/common/windows/disable-windows-defender-firewall.ps1 new file mode 100644 index 00000000..f5db6098 --- /dev/null +++ b/coin/provisioning/common/windows/disable-windows-defender-firewall.ps1 @@ -0,0 +1 @@ +reg.exe ADD "HKLM\System\CurrentControlSet\Services\mpssvc" /V Start /T REG_dWORD /D 4 /F diff --git a/coin/provisioning/qtci-windows-10-x86/01-disable-windows-defender-firewall.ps1 b/coin/provisioning/qtci-windows-10-x86/01-disable-windows-defender-firewall.ps1 new file mode 100644 index 00000000..b00105c4 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/01-disable-windows-defender-firewall.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\disable-windows-defender-firewall.ps1" + diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-defender-firewall.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-defender-firewall.ps1 new file mode 100644 index 00000000..b00105c4 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-defender-firewall.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\disable-windows-defender-firewall.ps1" + -- cgit v1.2.3 From 69342bb5b7b85a5bee2a8e1bdb7cf3ce80bc5e5c Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 12 May 2020 05:28:31 +0000 Subject: Revert "Provisioning: Disable windows defender firewall" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 48ff0140deed43b70c4efe53315fb15ea5e9cdfb. Reason for revert: QtBase WinRT test qcoreapplication needs mpssvc service to be enabled Change-Id: I523b668d9d7292aaaf7462585dc03819a3973010 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/windows/disable-windows-defender-firewall.ps1 | 1 - .../qtci-windows-10-x86/01-disable-windows-defender-firewall.ps1 | 2 -- .../qtci-windows-10-x86_64/01-disable-windows-defender-firewall.ps1 | 2 -- 3 files changed, 5 deletions(-) delete mode 100644 coin/provisioning/common/windows/disable-windows-defender-firewall.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/01-disable-windows-defender-firewall.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-defender-firewall.ps1 (limited to 'coin') diff --git a/coin/provisioning/common/windows/disable-windows-defender-firewall.ps1 b/coin/provisioning/common/windows/disable-windows-defender-firewall.ps1 deleted file mode 100644 index f5db6098..00000000 --- a/coin/provisioning/common/windows/disable-windows-defender-firewall.ps1 +++ /dev/null @@ -1 +0,0 @@ -reg.exe ADD "HKLM\System\CurrentControlSet\Services\mpssvc" /V Start /T REG_dWORD /D 4 /F diff --git a/coin/provisioning/qtci-windows-10-x86/01-disable-windows-defender-firewall.ps1 b/coin/provisioning/qtci-windows-10-x86/01-disable-windows-defender-firewall.ps1 deleted file mode 100644 index b00105c4..00000000 --- a/coin/provisioning/qtci-windows-10-x86/01-disable-windows-defender-firewall.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windows-defender-firewall.ps1" - diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-defender-firewall.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-defender-firewall.ps1 deleted file mode 100644 index b00105c4..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-defender-firewall.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windows-defender-firewall.ps1" - -- cgit v1.2.3 From 38139878ffdfea6b45d61bc3d071e7a244264516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 12 Mar 2020 07:38:09 +0000 Subject: Install GCC 10 on SLES 15 Task-number: QTQAINFRA-3444 Change-Id: Iaf9b3ea5331cfc0b3d19a09f55aa4df1de93fbb2 Reviewed-by: Qt CI Bot Reviewed-by: Heikki Halmet --- .../qtci-linux-SLES-15-x86_64/02-zypperpackages.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'coin') diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh index 3ea67ef0..638a9387 100755 --- a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh @@ -37,7 +37,16 @@ set -ex sudo zypper -nq install elfutils binutils -sudo zypper -nq install git gcc gcc-c++ make patch wget tar +sudo zypper addrepo --no-gpgcheck https://download.opensuse.org/repositories/devel:gcc/SLE-15/devel:gcc.repo +sudo zypper refresh +sudo zypper -nq install --force-resolution gcc10 gcc10-c++ + +sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 1 \ + --slave /usr/bin/g++ g++ /usr/bin/g++-10 \ + --slave /usr/bin/cc cc /usr/bin/gcc-10 \ + --slave /usr/bin/c++ c++ /usr/bin/g++-10 + +sudo zypper -nq install git make patch wget tar sudo zypper -nq install bison flex gperf \ zlib-devel \ -- cgit v1.2.3 From 16ca898568037a5edd7c9cd63467fd871ad47020 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 30 Mar 2020 08:15:17 +0300 Subject: Provisioning: Update QNX7 SDP to include OpenSSL 1.1.1 Still includes ICU 58 Task-number: QTQAINFRA-3537 Change-Id: I2f532ff32157e09eeec9a2196d075d4ec6347df5 Reviewed-by: Samuli Piippo --- coin/platform_configs/default.yaml | 7 ++++ coin/platform_configs/qt5.yaml | 45 ++++++++++++++++++++++ coin/provisioning/common/linux/qnx_700.sh | 4 +- .../qtci-macos-10.13-x86_64/40-qnx700.sh | 2 +- .../qtci-macos-10.14-x86_64/40-qnx700.sh | 5 +-- .../qtci-windows-10-x86_64/05-qnx_700.ps1 | 4 +- 6 files changed, 59 insertions(+), 8 deletions(-) (limited to 'coin') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 984bec61..0aa4d97b 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -140,3 +140,10 @@ Configurations: Compiler: 'GCC' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -xplatform integrity-armv7-imx6' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Target os: 'QNX_700' + Target arch: 'armv7' + Compiler: 'GCC' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -no-sql-mysql -qpa qnx -xplatform qnx-armle-v7-qcc -I /opt/qnx700/target/qnx7/usr/include/openssl1_1' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index 1e49118c..e467497f 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -55,6 +55,51 @@ Configurations: Target compiler: 'Clang' 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-r20 -android-ndk-host darwin-x86_64' +- + Template: 'qtci-macos-10.13-x86_64-2' + Target os: 'QNX_700' + Target arch: 'x86' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -extprefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc -I /opt/qnx700/target/qnx7/usr/include/openssl1_1' +- + Template: 'qtci-windows-10-x86_64-17' + Target os: 'QNX_700' + Target arch: 'armv7' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\Program Files\Git\bin;C:\MINGW810\mingw64\bin;$PATH;C:\qnx700\host\win64\x86_64\usr\bin;C:\qnx700\.qnx\bin', 'MAKEFLAGS=-j4 -Ic:\qnx700\target\qnx7\usr\include', 'QNX_CONFIGURATION=c:/qnx700/.qnx', 'QNX_CONFIGURATION_EXCLUSIVE=c:/qnx700/.qnx', 'QNX_TARGET=c:/qnx700/target/qnx7', 'QNX_HOST=c:/qnx700/host/win64/x86_64', 'LIB=""', 'INCLUDE=""'] + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc -Ic:\qnx700\target\qnx7\usr\include\openssl1_1' +- + Template: 'qtci-windows-10-x86_64-17' + Target os: 'QNX_700' + Target arch: 'armv8' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\Program Files\Git\bin;C:\MINGW810\mingw64\bin;$PATH;C:\qnx700\host\win64\x86_64\usr\bin;C:\qnx700\.qnx\bin', 'MAKEFLAGS=-j4 -Ic:\qnx700\target\qnx7\usr\include', 'QNX_CONFIGURATION=c:/qnx700/.qnx', 'QNX_CONFIGURATION_EXCLUSIVE=c:/qnx700/.qnx', 'QNX_TARGET=c:/qnx700/target/qnx7', 'QNX_HOST=c:/qnx700/host/win64/x86_64', 'LIB=""', 'INCLUDE=""'] + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc -Ic:\qnx700\target\qnx7\usr\include\openssl1_1' +- + Template: 'qtci-windows-10-x86_64-17' + Target os: 'QNX_700' + Target arch: 'x86_64' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\Program Files\Git\bin;C:\MINGW810\mingw64\bin;$PATH;C:\qnx700\host\win64\x86_64\usr\bin;C:\qnx700\.qnx\bin', 'MAKEFLAGS=-j4 -Ic:\qnx700\target\qnx7\usr\include', 'QNX_CONFIGURATION=c:/qnx700/.qnx', 'QNX_CONFIGURATION_EXCLUSIVE=c:/qnx700/.qnx', 'QNX_TARGET=c:/qnx700/target/qnx7', 'QNX_HOST=c:/qnx700/host/win64/x86_64', 'LIB=""', 'INCLUDE=""'] + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-x86-64-qcc -Ic:\qnx700\target\qnx7\usr\include\openssl1_1' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Target os: 'QNX_700' + Target arch: 'armv8' + Compiler: 'GCC' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-aarch64le-qcc -I /opt/qnx700/target/qnx7/usr/include/openssl1_1' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Target os: 'QNX_700' + Target arch: 'x86_64' + Compiler: 'GCC' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc -I /opt/qnx700/target/qnx7/usr/include/openssl1_1' - Template: 'qtci-windows-10-x86_64-17' Target os: 'WebAssembly' diff --git a/coin/provisioning/common/linux/qnx_700.sh b/coin/provisioning/common/linux/qnx_700.sh index 02cd57d3..b0424529 100755 --- a/coin/provisioning/common/linux/qnx_700.sh +++ b/coin/provisioning/common/linux/qnx_700.sh @@ -41,8 +41,8 @@ set -ex source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" targetFolder="/opt/" -sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-linux.tar.xz" -sha1="a278234bf38cc70ead98fc0a8d2e63070fb69621" +sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20200326-linux.tar.xz" +sha1="a92f2d6c649aa03e91a216dfa9df003fa00c033e" folderName="qnx700" targetFile="qnx700.tar.xz" wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh b/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh index d2905e9d..f134951a 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh @@ -36,7 +36,7 @@ # This script installs QNX 7. targetFolder="/opt/" -sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-macos.tar.xz" +sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20200326-macos.tar.xz" folderName="qnx700" sudo mkdir -p "$targetFolder" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh b/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh index a5547972..7f1f1233 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh @@ -36,13 +36,13 @@ # This script installs QNX 7. targetFolder="/opt/" -sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700_mac.zip" +sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20200326-macos.tar.xz" folderName="qnx700" sudo mkdir -p "$targetFolder" echo "Extracting QNX 7" -sudo unzip -q "$sourceFile" -d "$targetFolder" +sudo tar -C "$targetFolder" -Jxf $sourceFile sudo chown -R qt:wheel "$targetFolder"/"$folderName" @@ -54,4 +54,3 @@ fi # Set env variables echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc echo "QNX SDP = 7.0.0" >> ~/versions.txt - diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 index b7a5230c..986416fd 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 @@ -36,10 +36,10 @@ # This script installs QNX SDP 7.0 $zip = Get-DownloadLocation "qnx700.7z" -$url = "http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-windows.7z" +$url = "http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20200326-windows.7z" Download $url $url $zip -Verify-Checksum $zip "59c681466ff78f64b98b16a95b0b44650a729dfd" +Verify-Checksum $zip "ac3e780ba2fc68932d7f23c51bdc646d03e2e91f" Extract-7Zip $zip C:\ Set-EnvironmentVariable "QNX_700" "C:\QNX700" -- cgit v1.2.3 From 5279f32fdf97daf849e73d56739ca4f1256a9bf5 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 24 Mar 2020 11:00:17 +0200 Subject: Provisioning: Fetch pre-installed squish from local cache MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Squish installation is flaky so the installation phase has been moved from provisioning to Jenkins. Jenkins job will install the squish to target VM and copy it to local cache. This change only fetch the installed squish packages from local cache and uncompress those to VMs. Task-number: QTQAINFRA-3510 Task-number: QTQAINFRA-3107 Change-Id: I862da3250120dc6a43d9c04d973a25a691ca66a1 Reviewed-by: Tony Sarajärvi (cherry picked from commit b0286d6cd6c86cfc3c5dbd5a3879354996632831) Reviewed-by: Toni Saario --- coin/provisioning/common/unix/squishInstall.sh | 166 ++++++++------------- coin/provisioning/common/windows/squishInstall.ps1 | 130 ++++------------ 2 files changed, 88 insertions(+), 208 deletions(-) (limited to 'coin') diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index 24a4d507..a0c23350 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 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. @@ -33,120 +33,80 @@ ## ############################################################################# +# shellcheck source=./DownloadURL.sh +source "${BASH_SOURCE%/*}/DownloadURL.sh" + set -ex -# This script will install squish package for Linux and Mac. +# This script will fetch and extract pre-buildt squish package for Linux and Mac. # Squish is need by Release Test Automation (RTA) -version="6.5" -# Branch version without dot -qtBranch="513x" -squishFolder="/opt/squish" -squishUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/$qtBranch/" -squishFile="squish-nosignalhandler-$version-qt$qtBranch-linux64.run" +version="6.5.2" +qtBranch="514x" +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/.squish-3-license" if uname -a |grep -q Darwin; then - squishFile="squish-nosignalhandler-$version-qt$qtBranch-macx86_64.dmg" + compressedFolder="prebuild-squish-$version-$qtBranch-macx86_64.tar.gz" + sha1="91a1d7228dc4b4bd64f93191c33d2642abc97e14" +else + compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz" + sha1="63f33de55770e2588dd9f482546900e33d20f8ec" fi -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" + 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 -testSuite="suite_test_squish" -testSuiteUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/" +targetFileMount="$mountFolder"/"$compressedFolder" -# 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)" +echo "Mounting $preBuildCacheUrl to $mountFolder" +sudo mount "$preBuildCacheUrl" "$mountFolder" +echo "Create $installFolder if needed" +if [ ! -d "$installFolder" ]; then + sudo mkdir "$installFolder" fi -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 - - # 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 +echo "Uncompress $compressedFolder" +sudo tar -xzf "$targetFileMount" --directory "$installFolder" - function UnMount { - echo "Unmounting $mountFolder" - sudo diskutil unmount force "$mountFolder" || sudo umount -f "$mountFolder" - } +echo "Unmounting $mountFolder" +sudo diskutil unmount force "$mountFolder" || sudo umount -f "$mountFolder" - targetFileMount="$mountFolder"/"$targetFile" +sudo mv "$installFolder/rta_squish_$version" "$squishFolder" - 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 - 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 - 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 +if uname -a |grep -q "Ubuntu"; then + if [ ! -e "/usr/lib/tcl8.6" ]; then + sudo mkdir /usr/lib/tcl8.6 + sudo cp "$squishFolder/package/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/ fi +fi - echo "Changing ownerships" - sudo chown -R qt:$usersGroup "$targetDirectory" - sudo chown qt:$usersGroup "$HOME/.squish-3-license" -} +DownloadURL "$licenseUrl" "$licenseUrl" "3c6b2b3ca047f68e20f697afcc3a9d376f01b376" "$HOME/.squish-3-license" -echo "Set commands for environment variables in .bashrc" +echo "Changing ownerships" +sudo chown -R qt:$usersGroup "$squishFolder" +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/package" >> ~/.profile echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.profile @@ -155,19 +115,11 @@ else echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.bashrc fi -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 "Verifying Squish" +if "$squishFolder/package/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then echo "Squish installation tested successfully" else echo "Squish test failed! Package wasn't installed correctly." exit 1 fi + diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index f8d600d7..8396743e 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2019 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. @@ -33,120 +33,48 @@ . "$PSScriptRoot\helpers.ps1" -# This script will install squish package for Windows. +# This script will pre-installed 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.5" - -# Qt branch without dot (*.*) -$qtBranch = "513x" -# 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. +$version = "6.5.2" +$qtBranch = "514x" $targetDir = "C:\Utils\squish" -$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin" -$squishBranchUrl = "$squishUrl\$qtBranch" -$testSuite = "suite_test_squish" -$testSuiteUrl = "$squishUrl\$testSuite.7z" +$squishPackage = "C:\Utils\rta_squish" +$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build" +$licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin" # Squish license $licensePackage = ".squish-3-license" -$OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -Name ProductName).ProductName - -Function DownloadAndInstallSquish { - Param ( - [string]$version, - [string]$bit, - [string]$squishPackage - ) - $SquishUrl = $squishBranchUrl + "\squish-nosignalhandler-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe" - $SquishInstaller = "$targetDir\$squishPackage.exe" - $SquishParameters = "unattended=1 targetdir=$targetDir\$squishPackage" +Write-Host "Installing Squish license to home directory" +Copy-Item $licenseUrl\$licensePackage ~\$licensePackage - Write-Host "Fetching from URL $squishUrl" - Copy-Item "$SquishUrl" "$SquishInstaller" - Write-Host "Installing Squish" - $stdoutFile = [System.IO.Path]::GetTempFileName() - $stderrFile = [System.IO.Path]::GetTempFileName() - Start-Process -FilePath "$SquishInstaller" -Wait -ArgumentList $SquishParameters -PassThru -RedirectStandardOutput $stdoutFile -RedirectStandardError $stderrFile | Out-Null - 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 - } - } +if (Is64BitWinHost) { + $arch = "x64" +} else { + $arch = "x86" } -Function DownloadSquishLicence { - Param ( - [string]$squishUrl - ) - - 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 +$OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -Name ProductName).ProductName if ($OSVersion -eq "Windows 10 Enterprise") { - + $winVersion = "win10" if (Is64BitWinHost) { - DownloadAndInstallSquish $version win64 "msvc14" - DownloadAndInstallSquish $version win64 "msvc141" - DownloadAndInstallSquish $version win64 "mingw_gcc73_posix_seh" + $sha1 = "9262d3b749483094024c74986f93e9340afbdb62" } 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" + $sha1 = "0763b344afa327e6c374971492021c5e923be892" } - 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" + $winVersion = "win7" + $sha1 = "01b3529459da948cfde319d60becc666da0e1c4d" } +$squishArchive = "prebuild-squish-$version-$qtBranch-$winVersion-$arch.zip" + +Copy-Item "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable\$squishArchive" "C:\Utils" +Verify-Checksum "C:\Utils\$squishArchive" $sha1 +Extract-7Zip "C:\Utils\$squishArchive" "C:\Utils" +Rename-Item "$squishPackage" "$targetDir" + +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) } } -- cgit v1.2.3 From c4e49e746439de829c76c60168b1a14a5c214464 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 4 Jun 2020 11:33:43 +0300 Subject: Provisioning: Use signed opengl32 package Task-number: QTBUG-80252 Change-Id: Ife9942796ed64c4e2894fb3342259c674cf5d7ed Reviewed-by: Laszlo Agocs (cherry picked from commit 9c33fe844a2b9b1b601466740dd6097d649c1e0c) --- coin/provisioning/common/windows/mesa_llvmpipe.ps1 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'coin') diff --git a/coin/provisioning/common/windows/mesa_llvmpipe.ps1 b/coin/provisioning/common/windows/mesa_llvmpipe.ps1 index ee792896..17684575 100644 --- a/coin/provisioning/common/windows/mesa_llvmpipe.ps1 +++ b/coin/provisioning/common/windows/mesa_llvmpipe.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 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. @@ -34,12 +34,12 @@ $version = "11_2_2" $package = "C:\Windows\temp\opengl32sw.7z" -$mesaOpenglSha1_64 = "b2ffa5f230a0caa2c2e0bb9a5398bcfb81a0e5d1" -$mesaOpenglUrl_64_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-64-mesa_$version.7z" -$mesaOpenglUrl_64_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64-mesa_$version.7z" -$mesaOpenglSha1_32 = "e742e9d4e16b9c69b6d844940861d3ef1748356b" -$mesaOpenglUrl_32_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-32-mesa_$version.7z" -$mesaOpenglUrl_32_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version.7z" +$mesaOpenglSha1_64 = "0ed35efbc8112282be5d0c87c37fde2d15e81998" +$mesaOpenglUrl_64_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-64-mesa_$version-signed.7z" +$mesaOpenglUrl_64_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64-mesa_$version-signed.7z" +$mesaOpenglSha1_32 = "96bd6ca0d7fd249fb61531dca888965ffd20f53c" +$mesaOpenglUrl_32_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-32-mesa_$version-signed.7z" +$mesaOpenglUrl_32_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version-signed.7z" function Extract-Mesa { -- cgit v1.2.3 From a7654f4a033e732ab86c12eb925bb14a720471ac Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 22 May 2020 09:35:58 +0300 Subject: Provisioning: Change resolution for Windows 10 x86_64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently we have wrong resolution (1024x768) for 64-bit Windows. Correct one is 1280x800 Change-Id: Ifc17933a5901681a917f973cab4d7c1ca1dfbd9f Reviewed-by: Tony Sarajärvi (cherry picked from commit fa58a227cd14d301d7d10b6dce85eace953fa211) Reviewed-by: Toni Saario --- .../01-change-resolution.ps1 | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-change-resolution.ps1 (limited to 'coin') diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-change-resolution.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-change-resolution.ps1 new file mode 100644 index 00000000..679769a8 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/01-change-resolution.ps1 @@ -0,0 +1,25 @@ +$x_value = "1280" +$y_value = "800" + +Function ChangeResolution { + Param ( + [string]$driver + ) + + $path = "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\GraphicsDrivers\Configuration" + + reg.exe ADD "$path\$driver\00\" /V PrimSurfSize.cx /T REG_dWORD /D $x_value /F + reg.exe ADD "$path\$driver\00\" /V PrimSurfSize.cy /T REG_dWORD /D $y_value /F + reg.exe ADD "$path\$driver\00\00" /V DwmClipBox.bottom /T REG_dWORD /D $y_value /F + reg.exe ADD "$path\$driver\00\00" /V DwmClipBox.right /T REG_dWORD /D $x_value /F + reg.exe ADD "$path\$driver\00\00" /V PrimSurfSize.cx /T REG_dWORD /D $x_value /F + reg.exe ADD "$path\$driver\00\00" /V PrimSurfSize.cy /T REG_dWORD /D $y_value /F + reg.exe ADD "$path\$driver\00\00" /V ActiveSize.cy /T REG_dWORD /D $y_value /F + reg.exe ADD "$path\$driver\00\00" /V ActiveSize.cx /T REG_dWORD /D $x_value /F + +} + +Write-Host "Changing the resolution to ${x_value}x${y_value}" +ChangeResolution "MSBDD_NOEDID_1234_1111_00000000_00020000_0^E3701873EC28AFCFF631E725354CDC2D" +ChangeResolution "MSBDD_NOEDID_15AD_0405_00000000_000F0000_0^C13AE38966E73205F75BFACA84EB83A5" +ChangeResolution "MSNILNOEDID_1414_008D_FFFFFFFF_FFFFFFFF_0^030B4FCE00727AC1593E5B6FD18648D6" -- cgit v1.2.3 From 30714c7cb7d6f6820c9abde676137ff63832fd04 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 5 Jun 2020 10:48:51 +0300 Subject: Provisioning: Install Node.js Node.js is needed by QtWebengine Task-number: QTQAINFRA-3729 Change-Id: I23ece8567c569d8376eff52b7845589c60d069b8 Reviewed-by: Toni Saario Reviewed-by: Allan Sandfeld Jensen (cherry picked from commit 122cf4cc0ea3433512d58937d483d42717892d51) --- coin/provisioning/common/windows/nodejs.ps1 | 61 ++++++++++++++++++++++ .../04-install-packages.sh | 2 + .../qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 3 ++ .../02-zypperpackages.sh | 3 +- .../qtci-macos-10.13-x86_64/30-nodejs.sh | 6 +++ .../qtci-macos-10.14-x86_64/30-nodejs.sh | 6 +++ .../qtci-windows-10-x86_64/03-nodejs.ps1 | 1 + 7 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 coin/provisioning/common/windows/nodejs.ps1 create mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/30-nodejs.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/30-nodejs.sh create mode 100644 coin/provisioning/qtci-windows-10-x86_64/03-nodejs.ps1 (limited to 'coin') diff --git a/coin/provisioning/common/windows/nodejs.ps1 b/coin/provisioning/common/windows/nodejs.ps1 new file mode 100644 index 00000000..c56f6db6 --- /dev/null +++ b/coin/provisioning/common/windows/nodejs.ps1 @@ -0,0 +1,61 @@ +############################################################################# +## +## 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. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +. "$PSScriptRoot\helpers.ps1" + +# This script will install Node.js +# Needed by QtWebengine + +$version = "12.18.0" +$package = "C:\Windows\temp\nodejs-$version.zip" +$targetFolder = "C:\Utils\nodejs" +$arch = "$((Get-WmiObject Win32_Processor).AddressWidth)" +$externalUrl = "https://nodejs.org/dist/v$version/node-v$version-win-x$arch.zip" +$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/node-v$version-win-x$arch.zip" + +if ( $arch -eq 64 ) { + $sha1 = "457b1527d249ee471a9445953a906cb10c75378d" +} else { + $sha1 = "58801900f5bddca9c00feed6b84fed729426fc92" + +} + +Write-Host "Installing Node.js" +Download $externalUrl $internalUrl $package +Verify-Checksum $package $sha1 +mkdir $targetFolder +Extract-7Zip $package $targetFolder +Add-Path $targetFolder +Remove $package + +Write-Output "Node.js = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh index b3ecceea..c5304b21 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh @@ -80,6 +80,8 @@ installPackages+=(pulseaudio-libs-devel) installPackages+=(libXtst-devel) installPackages+=(nspr-devel) installPackages+=(nss-devel) +installPackages+=(rh-nodejs12-nodejs) +installPackages+=(rh-nodejs12-nodejs-devel) # For Android builds installPackages+=(java-1.8.0-openjdk-devel) # For receiving shasum diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index 639c82fd..ac35c278 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -84,6 +84,9 @@ installPackages+=(libudev-dev) installPackages+=(libegl1-mesa-dev) installPackages+=(libfontconfig1-dev) installPackages+=(libxss-dev) +installPackages+=(nodejs) +# NOTE! Can't install nodejs-dev because libssl1.0-dev conflicts with libssl1.0-dev which is depandency of nodejs-dev. + # Common event loop handling installPackages+=(libglib2.0-dev) # MySQL support diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh index d1f3050f..b509ff6c 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh @@ -36,7 +36,7 @@ sudo zypper -nq install libicu-devel libicu60_2 # qtwebengine sudo zypper -nq install alsa-devel dbus-1-devel \ libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \ - mozilla-nspr-devel mozilla-nss-devel + mozilla-nspr-devel mozilla-nss-devel nodejs10 nodejs10-devel # qtwebkit sudo zypper -nq install libxml2-devel libxslt-devel @@ -49,3 +49,4 @@ sudo zypper -nq install cups-devel #speech-dispatcher sudo zypper -nq install libspeechd-devel + diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-nodejs.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-nodejs.sh new file mode 100755 index 00000000..ab992405 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-nodejs.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +brew install nodejs + diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/30-nodejs.sh b/coin/provisioning/qtci-macos-10.14-x86_64/30-nodejs.sh new file mode 100755 index 00000000..ab992405 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/30-nodejs.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +brew install nodejs + diff --git a/coin/provisioning/qtci-windows-10-x86_64/03-nodejs.ps1 b/coin/provisioning/qtci-windows-10-x86_64/03-nodejs.ps1 new file mode 100644 index 00000000..6032e945 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/03-nodejs.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\nodejs.ps1" -- cgit v1.2.3 From 3bd4b2760eb68b528ab26b80f9eaa40a55803211 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 20 Sep 2019 12:45:39 +0000 Subject: Update ICC 18 to ICC 19.1 Task-number: QTQAINFRA-3241 Change-Id: I9259a9f602e8cdec29720178331dd7b833e52f81 Reviewed-by: Qt CI Bot Reviewed-by: Heikki Halmet --- coin/platform_configs/default.yaml | 3 ++- .../qtci-linux-openSUSE-15.1-x86_64/18-icc.sh | 24 ++++++++++++---------- 2 files changed, 15 insertions(+), 12 deletions(-) (limited to 'coin') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 0aa4d97b..296fdf52 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -60,9 +60,10 @@ Configurations: Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - Template: 'qtci-linux-openSUSE-15.1-x86_64' - Compiler: 'ICC_18' + Compiler: 'ICC' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -system-sqlite -R . -platform linux-icc-64 -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' + Environment variables: ['LD_LIBRARY_PATH=$ICC64_19_LDLP:$LD_LIBRARY_PATH', 'PATH=$ICC64_19_PATH:$PATH' ] - Template: 'qtci-linux-openSUSE-15.1-x86_64' Target os: 'WebAssembly' diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/18-icc.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/18-icc.sh index 7ab8528a..2bf47639 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/18-icc.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/18-icc.sh @@ -43,12 +43,12 @@ set -ex mainStorage="ci-files01-hki.intra.qt.io:/hdd/www/input" localMount="/mnt/storage/" -iccPackage="parallel_studio_xe_2018_update1_composer_edition_for_cpp.tgz" +iccPackage="parallel_studio_xe_2020_update1_composer_edition_for_cpp.tgz" iccPackageSource="$localMount/intel/$iccPackage" iccInstallPath="/opt/intel" iccTmpPath="/tmp/icc" -iccLicense="l_icc_2018.lic" +iccLicense="l_icc_2020.lic" iccLicenseSource="$localMount/semisecure/$iccLicense" iccLicenseTarget="/home/qt/$iccLicense" @@ -63,24 +63,26 @@ cp "$iccLicenseSource" "$iccLicenseTarget" sudo umount "$localMount" +{ serialNumber=$(cat $iccLicenseTarget | grep -e "SerialNumber" | awk -F '[=]' '{print $2}'); } 2>/dev/null + cat >"$iccInstallInstructions" <>~/.bashrc -echo "export ICC64_18_PATH=$iccInstallPath/compilers_and_libraries_2018.1.163/linux/bin/intel64:$iccInstallPath/bin" >>~/.bashrc -echo "ICC = 18.0.1 20171018" >> ~/versions.txt +echo "export ICC64_19_LDLP=$iccInstallPath/lib/intel64" >>~/.bashrc +echo "export ICC64_19_PATH=$iccInstallPath/compilers_and_libraries_2020.1.217/linux/bin/intel64:$iccInstallPath/bin" >>~/.bashrc +echo "ICC = 19.1.1.217 20200306" >> ~/versions.txt rm -rf "$iccTmpPath" -- cgit v1.2.3 From 5be3dc5f60dff51c8045ceb946209e61cf79d9b0 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 5 May 2020 08:28:51 +0300 Subject: Provisioning: Change mounting folder for Squish installation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sometimes some process is locking the mounted folder (/tmp) so that it can't be unmounted untill the process has been ended. Let's create squish folder under tmp and use that for mounting instead Task-number: QTQAINFRA-3709 Change-Id: I49ab8fd90af37a670e45764a176b62d7a732cc6c Reviewed-by: Dimitrios Apostolou Reviewed-by: Tony Sarajärvi (cherry picked from commit c671c2352e1db453da17d346316acfa627617786) Reviewed-by: Johanna Äijälä --- coin/provisioning/common/unix/squishInstall.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'coin') diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index a0c23350..7592814b 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -55,22 +55,21 @@ else sha1="63f33de55770e2588dd9f482546900e33d20f8ec" fi +mountFolder="/tmp/squish" +sudo mkdir "$mountFolder" + # 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 -- cgit v1.2.3 From 75ae2c8579fa4ebe713a858c2e9dca1996f3b8a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 26 Jun 2020 09:51:16 +0000 Subject: Disable LSO from the network adapters on Windows Disabling LSO from the adapter gives us huge performance boosts on Windows. In our tests 2 VMs within the same hosts had transfer speeds of 30 Mbit/s with this enabled, and 2Gbit/s with this disabled. Change-Id: Id794e7559c9e9005043361289a3db246a8528dd4 Reviewed-by: Heikki Halmet (cherry picked from commit 97aa7a0031cc681915aa2f56545a175f8b4d112d) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/windows/disable-netadapterlso.ps1 | 1 + coin/provisioning/qtci-windows-10-x86/00-disable-netadapterlso.ps1 | 1 + coin/provisioning/qtci-windows-10-x86_64/00-disable-netadapterlso.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86/00-disable-netadapterlso.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86_64/00-disable-netadapterlso.ps1 | 1 + 5 files changed, 5 insertions(+) create mode 100644 coin/provisioning/common/windows/disable-netadapterlso.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/00-disable-netadapterlso.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/00-disable-netadapterlso.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/00-disable-netadapterlso.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/00-disable-netadapterlso.ps1 (limited to 'coin') diff --git a/coin/provisioning/common/windows/disable-netadapterlso.ps1 b/coin/provisioning/common/windows/disable-netadapterlso.ps1 new file mode 100644 index 00000000..ca7ad3ca --- /dev/null +++ b/coin/provisioning/common/windows/disable-netadapterlso.ps1 @@ -0,0 +1 @@ +Disable-NetAdapterLso Ethernet diff --git a/coin/provisioning/qtci-windows-10-x86/00-disable-netadapterlso.ps1 b/coin/provisioning/qtci-windows-10-x86/00-disable-netadapterlso.ps1 new file mode 100644 index 00000000..d20f1402 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/00-disable-netadapterlso.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-netadapterlso.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/00-disable-netadapterlso.ps1 b/coin/provisioning/qtci-windows-10-x86_64/00-disable-netadapterlso.ps1 new file mode 100644 index 00000000..d20f1402 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/00-disable-netadapterlso.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-netadapterlso.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/00-disable-netadapterlso.ps1 b/coin/provisioning/qtci-windows-8.1-x86/00-disable-netadapterlso.ps1 new file mode 100644 index 00000000..d20f1402 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/00-disable-netadapterlso.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-netadapterlso.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/00-disable-netadapterlso.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/00-disable-netadapterlso.ps1 new file mode 100644 index 00000000..d20f1402 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/00-disable-netadapterlso.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-netadapterlso.ps1" -- cgit v1.2.3 From 7143d018dc7f1cbe5b7bd3d5fb5a8dd50fe71589 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 22 Jun 2020 09:43:37 +0300 Subject: Provisioning: Update OpenSSL to version 1.1.1g MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-3819 Change-Id: Ie7d0f3a0c73d123c3f3536e6b2dd2eb8608eb9cd (cherry picked from commit 2ac3dd2d6ff8acf8348ac8607160ab972de66325) Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/linux/openssl_for_android_linux.sh | 6 +++--- coin/provisioning/common/unix/install-openssl.sh | 6 +++--- coin/provisioning/common/windows/android-openssl.ps1 | 6 +++--- coin/provisioning/common/windows/openssl.ps1 | 8 ++++---- coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) (limited to 'coin') diff --git a/coin/provisioning/common/linux/openssl_for_android_linux.sh b/coin/provisioning/common/linux/openssl_for_android_linux.sh index 4860c01f..65e3b022 100755 --- a/coin/provisioning/common/linux/openssl_for_android_linux.sh +++ b/coin/provisioning/common/linux/openssl_for_android_linux.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 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. @@ -53,11 +53,11 @@ else rm -rf "$exports_file" fi -version="1.1.1d" +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="056057782325134b76d1931c48f2c7e6595d7ef4" +sha="b213a293f2127ec3e323fb3cfc0c9807664fd997" opensslHome="${HOME}/openssl/android/openssl-${version}" DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" mkdir -p "${HOME}/openssl/android/" diff --git a/coin/provisioning/common/unix/install-openssl.sh b/coin/provisioning/common/unix/install-openssl.sh index 08a3390b..75b7edbc 100755 --- a/coin/provisioning/common/unix/install-openssl.sh +++ b/coin/provisioning/common/unix/install-openssl.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2019 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.1d" +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="056057782325134b76d1931c48f2c7e6595d7ef4" +sha="b213a293f2127ec3e323fb3cfc0c9807664fd997" opensslHome="${HOME}/openssl-${version}" opensslSource="${opensslHome}-src" DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index d1877b64..010e7e76 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2019 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,9 +45,9 @@ 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.1d" +$version = "1.1.1g" $zip = Get-DownloadLocation ("openssl-$version.tar.gz") -$sha1 = "056057782325134b76d1931c48f2c7e6595d7ef4" +$sha1 = "b213a293f2127ec3e323fb3cfc0c9807664fd997" $destination = "C:\Utils\openssl-android-master" # msys unix style paths diff --git a/coin/provisioning/common/windows/openssl.ps1 b/coin/provisioning/common/windows/openssl.ps1 index 891f5db7..08f7d60f 100644 --- a/coin/provisioning/common/windows/openssl.ps1 +++ b/coin/provisioning/common/windows/openssl.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 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_1d" +$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 = "df9c40e9e82edf693c15302cbc8e8a057857a13c" + $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 = "5c49ccd3a5d17f63d25fb819963978f50c7966d0" +$sha1 = "c7d4b096c2413d1af819ccb291214fa3c4cece07" Write-Host "Fetching from URL ..." Download $externalUrl $internalUrl $packagex86 diff --git a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 index 269771c7..717e06fc 100644 --- a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 @@ -43,9 +43,9 @@ # nmake install -$version = "1.1.1d" +$version = "1.1.1g" $zip = Get-DownloadLocation ("openssl-$version.7z") -$sha1 = "2bf9379c4cea81858c4288cf06cc3444996bcad5" +$sha1 = "e94263ba067a5cc0ace17e26bb2f98c62d298b5a" $url = "http://ci-files01-hki.intra.qt.io/input/openssl/openssl_${version}_prebuild_x86_windows7_msvc2010.zip" Download $url $url $zip -- cgit v1.2.3