aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2018-01-19 10:20:04 +0200
committerHeikki Halmet <heikki.halmet@qt.io>2018-02-09 05:47:36 +0000
commit267e383d364ceb0da0a8400972fe303830bf18bf (patch)
tree331b21b4cb1078f59edf3efb70f23f80c8204393
parent9311e04f6f423c96a291cd51ce250b40a051209f (diff)
Provisioning: Add common shared folder
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 <tony.sarajarvi@qt.io> (cherry picked from commit dc5f851e787821733bc67c4a0328bc3db17be775)
-rw-r--r--coin/provisioning/common/shared/network_test_server_ip.txt (renamed from coin/provisioning/common/windows/network_test_server_ip.txt)0
-rw-r--r--coin/provisioning/common/windows/set-network-test-server.ps12
2 files changed, 1 insertions, 1 deletions
diff --git a/coin/provisioning/common/windows/network_test_server_ip.txt b/coin/provisioning/common/shared/network_test_server_ip.txt
index ec3d058a..ec3d058a 100644
--- a/coin/provisioning/common/windows/network_test_server_ip.txt
+++ b/coin/provisioning/common/shared/network_test_server_ip.txt
diff --git a/coin/provisioning/common/windows/set-network-test-server.ps1 b/coin/provisioning/common/windows/set-network-test-server.ps1
index c9a5291e..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]