Update windows tier1 image

Changes in coin to virtual machine template exposed a bug where older windows version deadlocks jom in multithreaded environment. -16 version of the windows 10 image is latest to include msvc2017, update to this. Task-number: COIN-598 Change-Id: Icc75ad4a6029332ebcd4acaad563156a139dc280 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit 573c35b164) Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2026-02-01 19:36:04 +08:00 · 2020-07-23 07:59:39 +03:00
parent c9d7845744
commit 5bb33f606e
9 changed files with 22 additions and 44 deletions
--- a/coin/platform_configs/default.yaml
+++ b/coin/platform_configs/default.yaml
@@ -1,5 +1,5 @@
 -
-    Template: 'qtci-windows-10-x86_64-10'
+    Template: 'qtci-windows-10-x86_64-16'
    Compiler: 'MSVC2015'
    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%'
 -
@@ -7,37 +7,37 @@
    Compiler: 'Mingw73'
    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++'
 -
-    Template: 'qtci-windows-10-x86_64-10'
+    Template: 'qtci-windows-10-x86_64-16'
    Target arch: 'x86'
    Compiler: 'MSVC2017'
    Features: ['Packaging']
    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86%'
 -
-    Template: 'qtci-windows-10-x86_64-10'
+    Template: 'qtci-windows-10-x86_64-16'
    Compiler: 'MSVC2015'
    Features: ['Packaging']
    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%'
 -
-    Template: 'qtci-windows-10-x86_64-10'
+    Template: 'qtci-windows-10-x86_64-16'
    Target os: 'WinRT_10'
    Target arch: 'x86'
    Compiler: 'MSVC2015'
    Features: ['DisableTests']
    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x86-msvc2015'
 -
-    Template: 'qtci-windows-10-x86_64-10'
+    Template: 'qtci-windows-10-x86_64-16'
    Target os: 'WinRT_10'
    Target arch: 'armv7'
    Compiler: 'MSVC2015'
    Features: ['Packaging', 'DisableTests']
    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-arm-msvc2015'
 -
-    Template: 'qtci-windows-10-x86_64-10'
+    Template: 'qtci-windows-10-x86_64-16'
    Compiler: 'MSVC2017'
    Features: ['Packaging']
    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%'
 -
-    Template: 'qtci-windows-10-x86_64-10'
+    Template: 'qtci-windows-10-x86_64-16'
    Target os: 'Android_ANY'
    Target arch: 'x86'
    Compiler: 'Mingw73'
--- a/coin/platform_configs/installer-framework.yaml
+++ b/coin/platform_configs/installer-framework.yaml
@@ -2,7 +2,7 @@ Version: 2
 Module only: True
 Configurations:
 -
-    Template: 'qtci-windows-10-x86_64-10'
+    Template: 'qtci-windows-10-x86_64-16'
    Compiler: 'MSVC2015'
    Target arch: 'x86'
    Features: ['Packaging']
--- a/coin/platform_configs/qt5.yaml
+++ b/coin/platform_configs/qt5.yaml
@@ -1,11 +1,11 @@
 -
-    Template: 'qtci-windows-10-x86_64-10'
+    Template: 'qtci-windows-10-x86_64-16'
    Target os: 'WinRT_10'
    Compiler: 'MSVC2015'
    Features: ['Packaging', 'DisableTests']
    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x64-msvc2015'
 -
-    Template: 'qtci-windows-10-x86_64-10'
+    Template: 'qtci-windows-10-x86_64-16'
    Target os: 'WinRT_10'
    Target arch: 'x86'
    Compiler: 'MSVC2017'
@@ -17,19 +17,19 @@
    Features: ['Packaging', 'DisableTests']
    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++'
 -
-    Template: 'qtci-windows-10-x86_64-10'
+    Template: 'qtci-windows-10-x86_64-16'
    Compiler: 'Mingw73'
    Features: ['Packaging', 'DisableTests']
    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++'
 -
-    Template: 'qtci-windows-10-x86_64-10'
+    Template: 'qtci-windows-10-x86_64-16'
    Target os: 'WinRT_10'
    Target arch: 'armv7'
    Compiler: 'MSVC2017'
    Features: ['Packaging', 'DisableTests']
    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-arm-msvc2017'
 -
-    Template: 'qtci-windows-10-x86_64-10'
+    Template: 'qtci-windows-10-x86_64-16'
    Target os: 'WinRT_10'
    Compiler: 'MSVC2017'
    Features: ['Packaging', 'DisableTests']
@@ -51,7 +51,7 @@
    Features: ['Packaging', 'DisableTests']
    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch arm64-v8a -xplatform android-clang'
 -
-    Template: 'qtci-windows-10-x86_64-10'
+    Template: 'qtci-windows-10-x86_64-16'
    Target os: 'Android_ANY'
    Target arch: 'armv7'
    Compiler: 'Mingw73'
@@ -59,7 +59,7 @@
    Features: ['Packaging', 'DisableTests']
    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch armeabi-v7a'
 -
-    Template: 'qtci-windows-10-x86_64-10'
+    Template: 'qtci-windows-10-x86_64-16'
    Target os: 'Android_ANY'
    Target arch: 'arm64'
    Compiler: 'Mingw73'
@@ -90,21 +90,21 @@
    Features: ['DisableTests']
    Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc'
 -
-    Template: 'qtci-windows-10-x86_64-10'
+    Template: 'qtci-windows-10-x86_64-16'
    Target os: 'QNX_700'
    Target arch: 'armv7'
    Compiler: 'Mingw73'
    Features: ['Packaging', 'DisableTests']
    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc'
 -
-    Template: 'qtci-windows-10-x86_64-10'
+    Template: 'qtci-windows-10-x86_64-16'
    Target os: 'QNX_700'
    Target arch: 'armv8'
    Compiler: 'Mingw73'
    Features: ['Packaging', 'DisableTests']
    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc'
 -
-    Template: 'qtci-windows-10-x86_64-10'
+    Template: 'qtci-windows-10-x86_64-16'
    Target os: 'QNX_700'
    Target arch: 'x86_64'
    Compiler: 'Mingw73'
--- a/coin/platform_configs/qtbase.yaml
+++ b/coin/platform_configs/qtbase.yaml
@@ -13,7 +13,7 @@
    Features: ['DisableTests']
    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib'
 -
-    Template: 'qtci-windows-10-x86_64-10'
+    Template: 'qtci-windows-10-x86_64-16'
    Target os: 'WinRT_10'
    Target arch: 'x86_64'
    Compiler: 'MSVC2015'
--- a/coin/platform_configs/qtconnectivity.yaml
+++ b/coin/platform_configs/qtconnectivity.yaml
@@ -1,5 +1,5 @@
 -
-    Template: 'qtci-windows-10-x86_64-10'
+    Template: 'qtci-windows-10-x86_64-16'
    Target os: 'WinRT_10'
    Target arch: 'x86_64'
    Compiler: 'MSVC2015'
--- a/coin/platform_configs/qtsaferenderer.yaml
+++ b/coin/platform_configs/qtsaferenderer.yaml
@@ -1,9 +1,9 @@
 -
-    Template: 'qtci-windows-10-x86_64-10'
+    Template: 'qtci-windows-10-x86_64-16'
    Compiler: 'Mingw73'
    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++'
 -
-    Template: 'qtci-windows-10-x86_64-10'
+    Template: 'qtci-windows-10-x86_64-16'
    Compiler: 'Mingw73'
    Features: ['Packaging', 'DisableTests']
    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++'
--- a/coin/provisioning/common/windows/disable-update-orchestrator.ps1
+++ b/coin/provisioning/common/windows/disable-update-orchestrator.ps1
@@ -1,19 +0,0 @@
-# Disable UpdateOrchestrator
-
-$name = "UpdateOrchestrator"
-$path = "C:\Windows\System32\Tasks\Microsoft\Windows\$name"
-
-takeown /F $path /A /R
-icacls $path /grant Administrators:F /T
-SCHTASKS /Change /TN "Microsoft\Windows\$name\Reboot" /DISABLE
-del "$path\Combined Scan Download Install"
-del "$path\Maintenance Install"
-del "$path\Reboot"
-del "$path\Policy Install"
-del "$path\Refresh Settings"
-del "$path\Resume On Boot"
-del "$path\USO_UxBroker_Display"
-del "$path\USO_UxBroker_ReadyToReboot"
-
-# Disable Update orchestrator service
-reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\UsoSvc" /V Start /T REG_dWORD /D 4 /F
--- a/coin/provisioning/qtci-windows-10-x86_64/01-remove-ms-zune.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/01-remove-ms-zune.ps1
@@ -1,2 +0,0 @@
-Remove-AppxPackage Microsoft.ZuneVideo_10.17092.13511.0_x64__8wekyb3d8bbwe
-Remove-AppxPackage Microsoft.ZuneMusic_10.17083.18321.0_x64__8wekyb3d8bbwe
--- a/coin/provisioning/qtci-windows-10-x86_64/98-disable-update-orchestrator.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/98-disable-update-orchestrator.ps1
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows\disable-update-orchestrator.ps1"
				`@@ -1 +0,0 @@`
				`. "$PSScriptRoot\..\common\windows\disable-update-orchestrator.ps1"`