diff options
author | Joni Jantti <joni.jantti@qt.io> | 2018-08-02 09:52:55 +0300 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-11-08 19:18:09 +0000 |
commit | de1fbf0659877eadf3b18e1f5cd126b87e2cba3e (patch) | |
tree | e6b4dcec8dbb21a8e3c9203bf8dd74c916843f55 | |
parent | 59db0bd1f0ea9abbf94ab70484b13b3694db65c9 (diff) |
Provisioning: Update QNX packages with security patches
BlackBerry has released security updates for QNX 7.0.0 and 6.6.0 that
we want to include in CI since out customers will most likely have them
installed.
Task-number: QTQAINFRA-1535
Change-Id: I6f38ca8831bb91609f79385a2dcbc51302f68eb8
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 07e349546c39b8d1b73e96264e764e09c3a4e656)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
-rwxr-xr-x | coin/provisioning/common/linux/qnx_660.sh | 4 | ||||
-rwxr-xr-x | coin/provisioning/common/linux/qnx_700.sh | 4 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/coin/provisioning/common/linux/qnx_660.sh b/coin/provisioning/common/linux/qnx_660.sh index 7f6ab063..2add6901 100755 --- a/coin/provisioning/common/linux/qnx_660.sh +++ b/coin/provisioning/common/linux/qnx_660.sh @@ -40,8 +40,8 @@ set -ex source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" targetFolder="/opt/" -sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/linux/qnx660.tar.gz" -sha1="E292CCAEF447AC1AA4DAD7802D604A5531ACD8D0" +sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/linux/qnx660-patch4687-linux.tar.gz" +sha1="ffcf91489699c42ce9c1d74941f1829531752bbe" folderName="qnx660" targetFile="qnx660.tar.gz" wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile" diff --git a/coin/provisioning/common/linux/qnx_700.sh b/coin/provisioning/common/linux/qnx_700.sh index 5901b634..9fd4f94d 100755 --- a/coin/provisioning/common/linux/qnx_700.sh +++ b/coin/provisioning/common/linux/qnx_700.sh @@ -40,8 +40,8 @@ set -ex source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" targetFolder="/opt/" -sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.tar.xz" -sha1="949a87c5f00d0756956cb4b1b3b213ecaeee9113" +sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20180801-linux.tar.xz" +sha1="5d2c8f531823b1f7a2e20968dc698c187c7de94c" folderName="qnx700" targetFile="qnx700.tar.xz" wget --tries=5 --waitretry=5 --output-document="$targetFile" "$sourceFile" 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 7786d363..c824cab5 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,9 +36,10 @@ # This script installs QNX SDP 7.0 $zip = "c:\users\qt\downloads\qnx700.7z" +$url = "http://ci-files01-hki.intra.qt.io/input/windows/qnx700-20180801-windows.7z" -Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.7z -OutFile $zip -Verify-Checksum $zip "DD3346A3429C06B59BF4D45CE0782F737D2424C7" +Download $url $url $zip +Verify-Checksum $zip "E281897C957B5FAB249BABB2DEB77EEBB9BA75E6" Extract-7Zip $zip C:\ Set-EnvironmentVariable "QNX_700" "C:\QNX700" |