summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoni Jantti <joni.jantti@qt.io>2018-03-23 09:29:30 +0200
committerJoni Jäntti <joni.jantti@qt.io>2018-04-05 13:10:26 +0000
commit9e74a1e5b7cf5f487b77068565ba7c0671b4dcd0 (patch)
tree07a17aa5b58bd81d8d6efcf324b7e6a5b583b961
parentbb9547048b36148aad520939dab4fc84b06af6d9 (diff)
Add a clean installed Win10_x86 for RTA
Task-number: QTQAINFRA-1842 Change-Id: I0334d74055690c7f850fd105fe008d11a8e57b8c Reviewed-by: Matti Paaso <matti.paaso@qt.io>
-rw-r--r--coin/platform_configs/tqtc-qt-rta.txt2
-rw-r--r--coin/provisioning/qtci-windows-10-x86/03-install-sevenzip.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86/08-install-jdk.ps11
3 files changed, 3 insertions, 1 deletions
diff --git a/coin/platform_configs/tqtc-qt-rta.txt b/coin/platform_configs/tqtc-qt-rta.txt
index 8143688f..5f9ab41f 100644
--- a/coin/platform_configs/tqtc-qt-rta.txt
+++ b/coin/platform_configs/tqtc-qt-rta.txt
@@ -2,5 +2,5 @@ Template Target OS Target arch Compiler Features
--------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-windows-7-x86_64-4 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests
qtci-windows-8.1-x86_64 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests
-qtci-windows-10-x86-6 MSVC2017 Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86-2 MSVC2017 Release ForceDebugInfo OpenGLDynamic
diff --git a/coin/provisioning/qtci-windows-10-x86/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-10-x86/03-install-sevenzip.ps1
new file mode 100644
index 00000000..a9044256
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/03-install-sevenzip.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/08-install-jdk.ps1 b/coin/provisioning/qtci-windows-10-x86/08-install-jdk.ps1
new file mode 100644
index 00000000..15065b55
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/08-install-jdk.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\install-jdk.ps1"