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 <samuli.piippo@qt.io>

6 files changed, 59 insertions, 8 deletions

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
@@ -56,6 +56,51 @@ Configurations:
     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'
     Compiler: 'Mingw'
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"