Clean up Windows provisioning scripts

The execution policy is set by the CI. The command usually fails as it
is in the scritps right now since it must be run as admin.

Change-Id: Ie31cb7fc15720cc6d76646bf475b3d60a02014d8
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>

diff --git a/coin/README b/coin/README
index 891d720..2fb3fe2 100644 (file)
--- a/coin/README
+++ b/coin/README
@@ -6,4 +6,6 @@ This directory contains files used by Qt's Continuous Integration system (Coin).
 provisioning
 ------------
 Contains scripts that apply to different test machines in order to run automatic tests on them.
 provisioning
 ------------
 Contains scripts that apply to different test machines in order to run automatic tests on them.

+For Windows scripts, make sure that the machine has "Set-ExecutionPolicy RemoteSigned -Force" set.
+(Run as admin in PowerShell)

 
 

diff --git a/coin/provisioning/qtci-windows-10-x86/icu.ps1 b/coin/provisioning/qtci-windows-10-x86/icu.ps1
index 7756bd0..325be36 100644 (file)
--- a/coin/provisioning/qtci-windows-10-x86/icu.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/icu.ps1
@@ -1,6 +1 @@
-Set-ExecutionPolicy RemoteSigned -Force
-
-# install jom

 . "$PSScriptRoot\..\common\icu.ps1"
 . "$PSScriptRoot\..\common\icu.ps1"

-
-Set-ExecutionPolicy Restricted -Force

diff --git a/coin/provisioning/qtci-windows-10-x86/jom.ps1 b/coin/provisioning/qtci-windows-10-x86/jom.ps1
index 360fad9..842c65d 100644 (file)
--- a/coin/provisioning/qtci-windows-10-x86/jom.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/jom.ps1
@@ -1,6 +1 @@
-Set-ExecutionPolicy RemoteSigned -Force
-
-# install jom

 . "$PSScriptRoot\..\common\jom.ps1"
 . "$PSScriptRoot\..\common\jom.ps1"

-
-Set-ExecutionPolicy Restricted -Force

diff --git a/coin/provisioning/qtci-windows-10-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-10-x86_64/icu.ps1
index 7756bd0..325be36 100644 (file)
--- a/coin/provisioning/qtci-windows-10-x86_64/icu.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/icu.ps1
@@ -1,6 +1 @@
-Set-ExecutionPolicy RemoteSigned -Force
-
-# install jom

 . "$PSScriptRoot\..\common\icu.ps1"
 . "$PSScriptRoot\..\common\icu.ps1"

-
-Set-ExecutionPolicy Restricted -Force

diff --git a/coin/provisioning/qtci-windows-10-x86_64/jom.ps1 b/coin/provisioning/qtci-windows-10-x86_64/jom.ps1
index 360fad9..842c65d 100644 (file)
--- a/coin/provisioning/qtci-windows-10-x86_64/jom.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/jom.ps1
@@ -1,6 +1 @@
-Set-ExecutionPolicy RemoteSigned -Force
-
-# install jom

 . "$PSScriptRoot\..\common\jom.ps1"
 . "$PSScriptRoot\..\common\jom.ps1"

-
-Set-ExecutionPolicy Restricted -Force

diff --git a/coin/provisioning/qtci-windows-7-x86/icu.ps1 b/coin/provisioning/qtci-windows-7-x86/icu.ps1
index 7756bd0..325be36 100644 (file)
--- a/coin/provisioning/qtci-windows-7-x86/icu.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/icu.ps1
@@ -1,6 +1 @@
-Set-ExecutionPolicy RemoteSigned -Force
-
-# install jom

 . "$PSScriptRoot\..\common\icu.ps1"
 . "$PSScriptRoot\..\common\icu.ps1"

-
-Set-ExecutionPolicy Restricted -Force

diff --git a/coin/provisioning/qtci-windows-7-x86/jom.ps1 b/coin/provisioning/qtci-windows-7-x86/jom.ps1
index 360fad9..842c65d 100644 (file)
--- a/coin/provisioning/qtci-windows-7-x86/jom.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/jom.ps1
@@ -1,6 +1 @@
-Set-ExecutionPolicy RemoteSigned -Force
-
-# install jom

 . "$PSScriptRoot\..\common\jom.ps1"
 . "$PSScriptRoot\..\common\jom.ps1"

-
-Set-ExecutionPolicy Restricted -Force

diff --git a/coin/provisioning/qtci-windows-8-x86/icu.ps1 b/coin/provisioning/qtci-windows-8-x86/icu.ps1
index 7756bd0..325be36 100644 (file)
--- a/coin/provisioning/qtci-windows-8-x86/icu.ps1
+++ b/coin/provisioning/qtci-windows-8-x86/icu.ps1
@@ -1,6 +1 @@
-Set-ExecutionPolicy RemoteSigned -Force
-
-# install jom

 . "$PSScriptRoot\..\common\icu.ps1"
 . "$PSScriptRoot\..\common\icu.ps1"

-
-Set-ExecutionPolicy Restricted -Force

diff --git a/coin/provisioning/qtci-windows-8-x86/jom.ps1 b/coin/provisioning/qtci-windows-8-x86/jom.ps1
index 360fad9..842c65d 100644 (file)
--- a/coin/provisioning/qtci-windows-8-x86/jom.ps1
+++ b/coin/provisioning/qtci-windows-8-x86/jom.ps1
@@ -1,6 +1 @@
-Set-ExecutionPolicy RemoteSigned -Force
-
-# install jom

 . "$PSScriptRoot\..\common\jom.ps1"
 . "$PSScriptRoot\..\common\jom.ps1"

-
-Set-ExecutionPolicy Restricted -Force

diff --git a/coin/provisioning/qtci-windows-8-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-8-x86_64/icu.ps1
index 7756bd0..325be36 100644 (file)
--- a/coin/provisioning/qtci-windows-8-x86_64/icu.ps1
+++ b/coin/provisioning/qtci-windows-8-x86_64/icu.ps1
@@ -1,6 +1 @@
-Set-ExecutionPolicy RemoteSigned -Force
-
-# install jom

 . "$PSScriptRoot\..\common\icu.ps1"
 . "$PSScriptRoot\..\common\icu.ps1"

-
-Set-ExecutionPolicy Restricted -Force

diff --git a/coin/provisioning/qtci-windows-8-x86_64/jom.ps1 b/coin/provisioning/qtci-windows-8-x86_64/jom.ps1
index 360fad9..842c65d 100644 (file)
--- a/coin/provisioning/qtci-windows-8-x86_64/jom.ps1
+++ b/coin/provisioning/qtci-windows-8-x86_64/jom.ps1
@@ -1,6 +1 @@
-Set-ExecutionPolicy RemoteSigned -Force
-
-# install jom

 . "$PSScriptRoot\..\common\jom.ps1"
 . "$PSScriptRoot\..\common\jom.ps1"

-
-Set-ExecutionPolicy Restricted -Force