From a7c5f204bc0f2b3f89ebb109d523fd3d04461fdf Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 5 Dec 2019 12:24:52 +0200 Subject: Provisioning: New Tier1 image for Windows 10 x86_64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change will upgrade Visual studios to the latest ones. Also MSVC 2019 build tools are installed for RTA. MSVC 2019 version 16.3.10 MSVC 2017 version 15.9.17 MSVC 2019 build tools version 16.3.10 Task-number: QTQAINFRA-3389 Change-Id: Ic21645f96f8d4e6abc38951bd6bab519b4864418 Reviewed-by: Friedemann Kleint Reviewed-by: Qt CI Bot Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.yaml | 16 ++++++++-------- coin/platform_configs/flashing-wizard.yaml | 4 ++-- coin/platform_configs/qdb.yaml | 4 ++-- coin/platform_configs/qt5.yaml | 20 ++++++++++---------- coin/platform_configs/qtbase.yaml | 2 +- coin/platform_configs/qtconnectivity.yaml | 2 +- coin/platform_configs/qtsaferenderer.yaml | 4 ++-- coin/platform_configs/tqtc-qt-config-gui.yaml | 4 ++-- .../README_MANUAL_INSTALLATIONS | 5 ++++- .../qtci-windows-10-x86_64/msvc2017.ps1 | 2 +- .../qtci-windows-10-x86_64/msvc2019.ps1 | 2 +- 11 files changed, 34 insertions(+), 31 deletions(-) (limited to 'coin') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index c703555c..21fd4f71 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -2,7 +2,7 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10-x86_64-15' + Template: 'qtci-windows-10-x86_64-16' Compiler: 'MSVC2015' Features: ['DisableTests'] 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%' @@ -11,43 +11,43 @@ Configurations: 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-15' + 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-15' + Template: 'qtci-windows-10-x86_64-16' Target arch: 'x86' Compiler: 'MSVC2019' Features: ['DisableTests'] 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-15' + Template: 'qtci-windows-10-x86_64-16' 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 -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-15' + 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-15' + 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-15' + 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-15' + Template: 'qtci-windows-10-x86_64-16' Compiler: 'MSVC2019' Features: ['DisableTests'] 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%' diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml index f0f0e51d..d64d3edf 100644 --- a/coin/platform_configs/flashing-wizard.yaml +++ b/coin/platform_configs/flashing-wizard.yaml @@ -2,12 +2,12 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10-x86_64-14' + 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% -static -no-icu' - - Template: 'qtci-windows-10-x86_64-14' + Template: 'qtci-windows-10-x86_64-16' Compiler: 'MSVC2017' Target arch: 'x86' Features: ['Packaging'] diff --git a/coin/platform_configs/qdb.yaml b/coin/platform_configs/qdb.yaml index 02198976..69f4b77f 100644 --- a/coin/platform_configs/qdb.yaml +++ b/coin/platform_configs/qdb.yaml @@ -2,13 +2,13 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10-x86_64-14' + Template: 'qtci-windows-10-x86_64-16' Compiler: 'MSVC2015' Target arch: 'x86' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -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%' - - Template: 'qtci-windows-10-x86_64-14' + Template: 'qtci-windows-10-x86_64-16' Compiler: 'MSVC2015' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -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%' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index e1d20a71..2e17abfd 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -1,11 +1,11 @@ - - Template: 'qtci-windows-10-x86_64-15' + 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-15' + Template: 'qtci-windows-10-x86_64-16' Target os: 'WinRT_10' Target arch: 'x86' Compiler: 'MSVC2017' @@ -17,25 +17,25 @@ Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -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-15' + 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 -force-debug-info -separate-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% -platform win32-g++' - - Template: 'qtci-windows-10-x86_64-15' + 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-15' + Template: 'qtci-windows-10-x86_64-16' Target os: 'WinRT_10' 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-x64-msvc2017' - - Template: 'qtci-windows-10-x86_64-15' + Template: 'qtci-windows-10-x86_64-16' Target os: 'Android_ANY' Target arch: 'multi' Compiler: 'Mingw73' @@ -58,21 +58,21 @@ Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix /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-15' + 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 -extprefix 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-15' + 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 -extprefix 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-15' + Template: 'qtci-windows-10-x86_64-16' Target os: 'QNX_700' Target arch: 'x86_64' Compiler: 'Mingw73' @@ -93,7 +93,7 @@ Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc' - - Template: 'qtci-windows-10-x86_64-15' + Template: 'qtci-windows-10-x86_64-16' Target os: 'WebAssembly' Compiler: 'Mingw73' Features: ['Packaging', 'DisableTests'] diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 22e16db9..680a9bbf 100644 --- 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-15' + Template: 'qtci-windows-10-x86_64-16' Target os: 'WinRT_10' Target arch: 'x86_64' Compiler: 'MSVC2015' diff --git a/coin/platform_configs/qtconnectivity.yaml b/coin/platform_configs/qtconnectivity.yaml index 13daa23d..30ac284d 100644 --- a/coin/platform_configs/qtconnectivity.yaml +++ b/coin/platform_configs/qtconnectivity.yaml @@ -1,5 +1,5 @@ - - Template: 'qtci-windows-10-x86_64-15' + Template: 'qtci-windows-10-x86_64-16' Target os: 'WinRT_10' Target arch: 'x86_64' Compiler: 'MSVC2015' diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index be14923b..5844a186 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -1,9 +1,9 @@ - - Template: 'qtci-windows-10-x86_64-15' + 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-15' + 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++' diff --git a/coin/platform_configs/tqtc-qt-config-gui.yaml b/coin/platform_configs/tqtc-qt-config-gui.yaml index da37d0e5..9f76340e 100644 --- a/coin/platform_configs/tqtc-qt-config-gui.yaml +++ b/coin/platform_configs/tqtc-qt-config-gui.yaml @@ -2,12 +2,12 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10-x86_64-14' + 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% -static -no-icu' - - Template: 'qtci-windows-10-x86_64-14' + Template: 'qtci-windows-10-x86_64-16' Compiler: 'MSVC2017' Target arch: 'x86' Features: ['Packaging'] diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS b/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS index 2d85d8f8..c2daf225 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS @@ -8,4 +8,7 @@ Timezone: set to UTC Administrator tools - services - Windows search: stop & disable Power settings screen & slee: never Turn windows features on or off -> Check the "SMB 1.0/CIFS File Sharing Support" - +MSVC 2019 build tools (default installation, no additional selections). + * Install after MSVC2019 is installed! + * Installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe" + * Version: 16.3.10 diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 index e4cf9bf3..c4b04df0 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 @@ -35,7 +35,7 @@ $version = "2017" # Current version was manually upgraded from the installer -$version_number = "15.9.16" +$version_number = "15.9.17" $installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__1312218103.1526017942.exe" # Following components were selected from installer: diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.ps1 index 77242a21..538d478c 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.ps1 @@ -35,7 +35,7 @@ $version = "2019" # Current version was manually upgraded from the installer -$version_number = "16.3.2" +$version_number = "16.3.10" $installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__505064367.1547034421.exe" .NET Framework 4.5 targeting pack -- cgit v1.2.3