From 9e74a1e5b7cf5f487b77068565ba7c0671b4dcd0 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Fri, 23 Mar 2018 09:29:30 +0200 Subject: Add a clean installed Win10_x86 for RTA Task-number: QTQAINFRA-1842 Change-Id: I0334d74055690c7f850fd105fe008d11a8e57b8c Reviewed-by: Matti Paaso --- coin/platform_configs/tqtc-qt-rta.txt | 2 +- coin/provisioning/qtci-windows-10-x86/03-install-sevenzip.ps1 | 1 + coin/provisioning/qtci-windows-10-x86/08-install-jdk.ps1 | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 coin/provisioning/qtci-windows-10-x86/03-install-sevenzip.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/08-install-jdk.ps1 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" -- cgit v1.2.3