diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-11-11 10:52:16 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-11-11 10:52:16 +0100 |
| commit | c85543f88df7268f63bcfd64220ba6c21797f27b (patch) | |
| tree | 6a3311a969d068d2d05fc3d4f2544aff2cacf4a5 /coin/provisioning/qtci-linux-RHEL-7.6-x86_64 | |
| parent | 4e5a86d2bbe6cd30e46a364f96a861b37bbf7f96 (diff) | |
| parent | ae27f21d2697edf0b513b2c52bb1ecbbe658053b (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
coin/platform_configs/default.yaml
coin/platform_configs/qt5.yaml
coin/platform_configs/qtbase.yaml
coin/platform_configs/qtdeclarative.yaml
coin/platform_configs/qtsaferenderer.yaml
coin/platform_configs/qtsdk.yaml
coin/provisioning/common/linux/cmake_linux.sh
coin/provisioning/common/windows/cmake.ps1
Change-Id: I37bb513e3be19e4de4003679f8528677e57c09ee
Diffstat (limited to 'coin/provisioning/qtci-linux-RHEL-7.6-x86_64')
3 files changed, 8 insertions, 5 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh index 548cb9ca..28f7faa0 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh @@ -38,6 +38,7 @@ set -ex echo "set WritePreparedUpdates=false" | sudo tee -a /etc/PackageKit/PackageKit.conf sudo systemctl stop packagekit sudo systemctl disable packagekit +sudo yum -y remove PackageKit gnome-software sudo subscription-manager config --rhsm.manage_repos=0 sudo subscription-manager refresh diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh index 5cdf7df0..443bfa9e 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh @@ -38,14 +38,13 @@ set -ex # shellcheck source=../common/unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" -package="epel-release-7-11.noarch.rpm" +package="epel-release-7-12.noarch.rpm" primaryUrl="https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/e/$package" cacheUrl="http://ci-files01-hki.intra.qt.io/input/rhel7/$package" -sha1="5512b80e5b71f2370d8419fa16a0bc14c5edf854" +sha256="d6bb83c00ab3af26ded56459e7d6fceabfef66efbe0780b4dedbe81d62c07cd5" targetFile="/tmp/$package" -DownloadURL "$primaryUrl" "$cacheUrl" "$sha1" "$targetFile" +DownloadURL "$cacheUrl" "$primaryUrl" "$sha256" "$targetFile" -sudo rpm -ivh "$targetFile" +sudo yum -y install "$targetFile" rm "$targetFile" - |