From dc5f851e787821733bc67c4a0328bc3db17be775 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 19 Jan 2018 10:20:04 +0200 Subject: Provisioning: Add common shared folder MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Common shared folder includes scripts of files which are common for all operating system families. Changes under shared folder will trigger provisioning for all platforms Change-Id: I0789f87b76876d5f92673fe2f0e72d770e5f5ea4 Task-number: QTQAINFRA-1451 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/network_test_server_ip.txt | 1 - coin/provisioning/common/shared/network_test_server_ip.txt | 1 + coin/provisioning/common/shared/sw_versions.txt | 1 + coin/provisioning/common/sw_versions.txt | 1 - coin/provisioning/common/unix/libclang.sh | 2 +- coin/provisioning/common/windows/libclang.ps1 | 2 +- coin/provisioning/common/windows/set-network-test-server.ps1 | 2 +- coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh | 2 +- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh | 2 +- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh | 2 +- coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh | 2 +- coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh | 2 +- 12 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 coin/provisioning/common/network_test_server_ip.txt create mode 100644 coin/provisioning/common/shared/network_test_server_ip.txt create mode 100644 coin/provisioning/common/shared/sw_versions.txt delete mode 100644 coin/provisioning/common/sw_versions.txt (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/network_test_server_ip.txt b/coin/provisioning/common/network_test_server_ip.txt deleted file mode 100644 index ec3d058a..00000000 --- a/coin/provisioning/common/network_test_server_ip.txt +++ /dev/null @@ -1 +0,0 @@ -network_test_server_ip=10.212.2.216 diff --git a/coin/provisioning/common/shared/network_test_server_ip.txt b/coin/provisioning/common/shared/network_test_server_ip.txt new file mode 100644 index 00000000..ec3d058a --- /dev/null +++ b/coin/provisioning/common/shared/network_test_server_ip.txt @@ -0,0 +1 @@ +network_test_server_ip=10.212.2.216 diff --git a/coin/provisioning/common/shared/sw_versions.txt b/coin/provisioning/common/shared/sw_versions.txt new file mode 100644 index 00000000..cc165dd5 --- /dev/null +++ b/coin/provisioning/common/shared/sw_versions.txt @@ -0,0 +1 @@ +libclang_version="4.0" diff --git a/coin/provisioning/common/sw_versions.txt b/coin/provisioning/common/sw_versions.txt deleted file mode 100644 index cc165dd5..00000000 --- a/coin/provisioning/common/sw_versions.txt +++ /dev/null @@ -1 +0,0 @@ -libclang_version="4.0" diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh index 69d9ff96..d59c9fa2 100755 --- a/coin/provisioning/common/unix/libclang.sh +++ b/coin/provisioning/common/unix/libclang.sh @@ -43,7 +43,7 @@ set -e source "${BASH_SOURCE%/*}/check_and_set_proxy.sh" BASEDIR=$(dirname "$0") -. $BASEDIR/../sw_versions.txt +. $BASEDIR/../shared/sw_versions.txt url=$1 sha1=$2 version=$3 diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 index 9d857051..208d1ed4 100644 --- a/coin/provisioning/common/windows/libclang.ps1 +++ b/coin/provisioning/common/windows/libclang.ps1 @@ -4,7 +4,7 @@ param([Int32]$archVer=32) # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/). # The Clang library (C-bindings), version 3.9 or higher is required for building. -Get-Content "$PSScriptRoot\..\sw_versions.txt" | Foreach-Object { +Get-Content "$PSScriptRoot\..\shared\sw_versions.txt" | Foreach-Object { $var = $_.Split('=') New-Variable -Name $var[0] -Value $var[1] $libclang_version = $libclang_version -replace '["."]' diff --git a/coin/provisioning/common/windows/set-network-test-server.ps1 b/coin/provisioning/common/windows/set-network-test-server.ps1 index 69059a2a..e6e92d48 100644 --- a/coin/provisioning/common/windows/set-network-test-server.ps1 +++ b/coin/provisioning/common/windows/set-network-test-server.ps1 @@ -35,7 +35,7 @@ # This script will set the network test server IP in to hosts file -$n = Get-Content "$PSScriptRoot\..\network_test_server_ip.txt" +$n = Get-Content "$PSScriptRoot\..\shared\network_test_server_ip.txt" $n = $n.Split('=') New-Variable -Name $n[0] -Value $n[1] diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh index b418ed8b..fb5a81b3 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh @@ -3,7 +3,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-Rhel6.6-gcc4.9-x86_64.7z" SHA1="c7466109628418a6aa3db8b3f5825f847f1c4952" 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-openSUSE-42.3-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh index f419b7c1..4ebc1b44 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh @@ -3,7 +3,7 @@ set -ex BASEDIR=$(dirname "$0") -source $BASEDIR/../common/network_test_server_ip.txt +source $BASEDIR/../common/shared/network_test_server_ip.txt source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh index 65d3ad4b..b4155e86 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh @@ -3,7 +3,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" -- cgit v1.2.3