diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-29 13:34:28 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-29 13:34:28 +0100 |
| commit | 485244b016172445aa20bd31fb84fec6b7724cf5 (patch) | |
| tree | cf2a40fea5517379e56e624bcb27936873546f1e /coin/provisioning/qtci-linux-RHEL-7.4-x86_64 | |
| parent | 3504be0d83cdfb565ee5e3c043c33c54dacbfa54 (diff) | |
| parent | 00e31823d35eecfa6ee265b1ccdb563dfe1b905f (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10.1
This was pushed directly, bypassing codereview.qt-project.org to get
provisioning back into a working state.
Change-Id: Ia5d2e6f7079162f571cd7c7994c0f2b3133b1163
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'coin/provisioning/qtci-linux-RHEL-7.4-x86_64')
4 files changed, 10 insertions, 3 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh index 8b10ffd1..84238ebf 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -38,3 +38,6 @@ set -ex # refresh local certificates sudo subscription-manager refresh +# Attach available subscriptions to system. This is needed when subscriptions are renewed. +sudo subscription-manager attach --auto + diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh index f8847e51..a7718d96 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh @@ -37,7 +37,7 @@ set -ex BASEDIR=$(dirname "$0") source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" -source $BASEDIR/../common/network_test_server_ip.txt +source $BASEDIR/../common/shared/network_test_server_ip.txt echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh index fa8d3a44..49d4d4f5 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh @@ -2,7 +2,7 @@ set -ex BASEDIR=$(dirname "$0") -. $BASEDIR/../common/sw_versions.txt +. $BASEDIR/../common/shared/sw_versions.txt VERSION=$libclang_version URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" SHA1="bbdbbc0296f42310077539b7247d285386119ef4" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-squish.sh new file mode 100755 index 00000000..27ff15c3 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-squish.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +BASEDIR=$(dirname "$0") +$BASEDIR/../common/unix/squishInstall.sh + |