diff options
author | Liang Qi <liang.qi@qt.io> | 2017-11-25 16:40:50 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-11-25 16:40:50 +0100 |
commit | bc1694419108d709357fd43add106e67fd2ae982 (patch) | |
tree | 66f1147f64ff95d943b3125fcc509a275af55645 | |
parent | 9a9d798ce44ae6a77d408e44dd61fa5a5e07b99f (diff) | |
parent | 63bda0c988cad19d3a1d6906fdf3e75af1ee84b0 (diff) |
Merge remote-tracking branch 'origin/5.9.3' into 5.10.0
Conflicts:
.gitmodules
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/mqtt_broker.sh
Change-Id: I3bfaa9531a4b62426ec276c764ffda5cffcbdcaa
-rw-r--r-- | coin/provisioning/common/cmake.ps1 | 3 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh (renamed from coin/provisioning/qtci-linux-RHEL-7.2-x86_64/001-refresh-subscription-manager.sh) | 32 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/qtci-linux-RHEL-7.4-x86_64/mqtt_broker.sh (renamed from coin/provisioning/qtci-linux-RHEL-7.2-x86_64/mqtt_broker.sh) | 0 |
3 files changed, 32 insertions, 3 deletions
diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/cmake.ps1 index 1716467c..d7e26556 100644 --- a/coin/provisioning/common/cmake.ps1 +++ b/coin/provisioning/common/cmake.ps1 @@ -40,6 +40,9 @@ $zip = "c:\users\qt\downloads\cmake-" + $version + "-win32-x86.zip" $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip" $cachedurl = "\\ci-files01-hki.intra.qt.io\provisioning\cmake\cmake-" + $version + "-win32-x86.zip" +echo "Removing old cmake" +Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue + Download $officialurl $cachedurl $zip Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E" diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/001-refresh-subscription-manager.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh index 4a61bed1..6ae0f820 100644..100755 --- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/001-refresh-subscription-manager.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh @@ -1,8 +1,8 @@ #!/bin/bash + ############################################################################# ## ## 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,5 +33,31 @@ ## ############################################################################# -# refresh local certificates -sudo subscription-manager refresh +source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" + +set -ex + +packageEpel="epel-release-latest-7.noarch.rpm" +OfficialUrl="https://dl.fedoraproject.org/pub/epel/$packageEpel" +CachedUrl="http://ci-files01-hki.intra.qt.io/input/redhat/$packageEpel" +SHA1="5512b80e5b71f2370d8419fa16a0bc14c5edf854" + +DownloadURL $OfficialUrl $CachedUrl $SHA1 ./$packageEpel +sudo rpm -Uvh $packageEpel +sudo rm -f $packageEpel + +# install python3 +sudo yum install -y python34-devel + +# install pip3 + +packagePip="get-pip.py" +OfficialUrlPip="https://bootstrap.pypa.io/$packagePip" +CachedUrlPip="http://ci-files01-hki.intra.qt.io/input/redhat/$packagePip" +SHA1Pip="3d45cef22b043b2b333baa63abaa99544e9c031d" + +DownloadURL $OfficialUrlPip $CachedUrlPip $SHA1Pip ./$packagePip +sudo python3 $packagePip +sudo rm -f $packagePip +sudo pip3 install virtualenv + diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/mqtt_broker.sh index e367c20b..e367c20b 100644..100755 --- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/mqtt_broker.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/mqtt_broker.sh |