diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-29 13:53:08 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-29 14:06:05 +0100 |
| commit | a434f14bd93f387f5f981fcd7d27ce95384d1ce6 (patch) | |
| tree | b5cc79dd41ef6dd3c49dafcf899d469574632123 /coin/provisioning/qtci-linux-RHEL-7.4-x86_64 | |
| parent | 282899453d2c6b4c51bbd94fc228f2bb711d64f6 (diff) | |
| parent | 351a519340d509300c754d0a62771a7f6e38ea4c (diff) | |
Merge remote-tracking branch 'origin/5.10' into 5.11
Conflicts:
coin/provisioning/common/linux/qnx_700.sh
coin/provisioning/common/windows/libclang.ps1
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Change-Id: I7fe1337fb8a575083e8b649d1a051abc82e3b408
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 + |