diff options
16 files changed, 69 insertions, 116 deletions
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index e1620b4c..4a3d06aa 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,7 +1,7 @@ Version: 2 Configurations: - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' 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% -qt-zlib' @@ -11,32 +11,32 @@ Configurations: Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH'] 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++ -qt-zlib' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target arch: 'x86' Compiler: 'MSVC2019' 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% -qt-zlib' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' 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% -qt-zlib' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' 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-51' + Template: 'qtci-windows-10-x86_64-52' 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-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'MSVC2019' 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% -qt-zlib' diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml index 17e80878..25e71ccf 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-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'MSVC2019' 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-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'MSVC2019' Target arch: 'x86' Features: ['Packaging'] diff --git a/coin/platform_configs/qdb.yaml b/coin/platform_configs/qdb.yaml index 7b4660a2..0b16b11a 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-51' + Template: 'qtci-windows-10-x86_64-52' 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-51' + Template: 'qtci-windows-10-x86_64-52' 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 9d8eeeff..fe4e5b96 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -1,13 +1,13 @@ Version: 2 Configurations: - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' 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-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'WinRT_10' Target arch: 'x86' Compiler: 'MSVC2019' @@ -20,26 +20,26 @@ Configurations: Features: ['Packaging'] 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++ QMAKE_LFLAGS_APP+=-s -qt-zlib' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] Features: ['Packaging'] 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++ QMAKE_LFLAGS_APP+=-s -qt-zlib' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'WinRT_10' Target arch: 'armv7' Compiler: 'MSVC2019' 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-msvc2019 -xplatform winrt-arm-msvc2019' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'WinRT_10' Compiler: 'MSVC2019' 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-msvc2019 -xplatform winrt-x64-msvc2019' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'Android_ANY' Target arch: 'multi' Compiler: 'Mingw' @@ -63,7 +63,7 @@ Configurations: 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 -I /opt/qnx700/target/qnx7/usr/include/openssl1_1' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'QNX_700' Target arch: 'armv7' Compiler: 'Mingw' @@ -71,7 +71,7 @@ Configurations: 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 -Ic:\qnx700\target\qnx7\usr\include\openssl1_1' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'QNX_700' Target arch: 'armv8' Compiler: 'Mingw' @@ -79,7 +79,7 @@ Configurations: 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 -Ic:\qnx700\target\qnx7\usr\include\openssl1_1' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'QNX_700' Target arch: 'x86_64' Compiler: 'Mingw' @@ -101,7 +101,7 @@ Configurations: 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 -I /opt/qnx700/target/qnx7/usr/include/openssl1_1' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'WebAssembly' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 5cdca1c0..8ad2a8b1 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-51' + Template: 'qtci-windows-10-x86_64-52' 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 f0b33ee4..5e2d5c7e 100644 --- a/coin/platform_configs/qtconnectivity.yaml +++ b/coin/platform_configs/qtconnectivity.yaml @@ -1,5 +1,5 @@ - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' 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 f92b3ba2..e9c2be74 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -1,12 +1,12 @@ Version: 2 Configurations: - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] 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-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] Features: ['Packaging', 'DisableTests'] diff --git a/coin/platform_configs/tqtc-qt-config-gui.yaml b/coin/platform_configs/tqtc-qt-config-gui.yaml index fb14fe15..073ef562 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-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'MSVC2019' 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-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'MSVC2019' 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 ac602763..0b0c89fd 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 @@ -1,12 +1,5 @@ # List about manual pre-installations to Tier1 image: -Virtual Hardware: -CPU: 4 -Memory: 8 GB -Hard Disk: 550 GB -CI_NW -Video Card - total memory: 32MB - VM Options: Boot options/Firmware: BIOS @@ -18,6 +11,14 @@ Windows 10 Enterprise Region: Finland Keyboard layout: United Kingdom +* Don't use online speech recognition +* Let Microsoft and apps use your location: no +* Find my devicer: no +* Send diagnostic data to Microsoft: Send required diagnostic data +* Imporve inking & typing: no +* Get tailored expreriences with diagnostic data: no +* Let apps use advertising ID: no + * VMware tools (complete) installed * Resolution set to 1280x800 * Coin-setup: @@ -45,12 +46,7 @@ Keyboard layout: United Kingdom * (Restart Windows) * Google Chrome installed for RTA * Virus & threat protection settings: - - Real-time protection -> off - - Cloud-delivered protection -> off - - Automatic sample submission -> off - - Tamper protection -> off -* Virus & threat protection notifications: - - Get informational notifications -> off - - Account protection notifications -> off + * Check that there's no active antivirus providers +* From 'Region Settings' + * Set Regional format: English (United States) * Activate Windows - diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1 index 21938f7f..08dfb88e 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1 @@ -1,6 +1,6 @@ ########################################################################### ## -## Copyright (C) 2019 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -44,18 +44,6 @@ Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableAntiSpyware /T REG_dWORD /D 1 /F" Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableRoutinelyTakingAction /T REG_dWORD /D 1 /F" -# 'Windows Defender Cache Maintenance' - "Periodic maintenance task." -DisableSchedulerTask "Windows Defender\Windows Defender Cache Maintenance" - -# 'Windows Defender Cleanup' - "Periodic cleanup task." -DisableSchedulerTask "Windows Defender\Windows Defender Cleanup" - -# 'Windows Defender Scheduled Scan' - "Periodic scan task." -DisableSchedulerTask "Windows Defender\Windows Defender Scheduled Scan" - -# 'Windows Defender Verification' - "Periodic verification task." -DisableSchedulerTask "Windows Defender\Windows Defender Verification" - # Disable 'QueueReporting' - "Windows Error Reporting task to process queued reports." DisableSchedulerTask "Windows Error Reporting\QueueReporting" diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 deleted file mode 100644 index 9ac8196e..00000000 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 +++ /dev/null @@ -1,52 +0,0 @@ -############################################################################# -## -## Copyright (C) 2018 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# Visual Studio $version was installed manually using $installer. -$version = "2015 update 3" -$version_number ="14.0.25420.1" -$installer = "en_visual_studio_professional_2015_with_update_3_x86_x64_web_installer_8922978.exe" - -# default plus following components were selected: -# * Visual C++ -# - Common Tools for Visual C++ 2015 -# * Universal Windows App Development Tools -# - Tools (1.4.1) and Windows SDK (10.0.14393) -# - Windows 10 SDK (10.0.10586) -# - Windows 10 SDK (10.0.10240) -# * Common Tools -# -Visual Studio Extensibility Tools Update 3 - -# NOTE! Windows SDK 10.0.14393 installation failed through visual studio installer so it was installed using $sdk_installer -$sdk_installer = "http://ci-files01-hki.intra.qt.io/input/windows/sdksetup.exe" - -echo "Visual Studio = $version version $version_number" >> ~\versions.txt diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.txt b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.txt new file mode 100644 index 00000000..c4714602 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.txt @@ -0,0 +1,18 @@ +# Visual Studio $version was installed manually using $installer. +$version = "2015 update 3" +$version_number ="14.0.25420.1" +$installer = "en_visual_studio_professional_2015_with_update_3_x86_x64_web_installer_8922978.exe" + +# default plus following components were selected: +# * Programming Languages +# * Visual C++ +# - Common Tools for Visual C++ 2015 +# * Universal Windows App Development Tools +# - Tools (1.4.1) and Windows SDK (10.0.14393) +# - Windows 10 SDK (10.0.10586) +# - Windows 10 SDK (10.0.10240) +# * Common Tools +# -Visual Studio Extensibility Tools Update 3 + +# NOTE! Windows SDK 10.0.14393 installation failed through visual studio installer so it was installed using $sdk_installer +$sdk_installer = "http://ci-files01-hki.intra.qt.io/input/windows/sdksetup.exe" diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt index e5fc9e93..163621c5 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt @@ -2,13 +2,13 @@ $version = "2019" # Current version was manually upgraded from the installer -$version_number = "16.6.2" +$version_number = "16.8.1" $installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__505064367.1547034421.exe" 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.6.2 + * Version: 16.8.1 Installed MSVC-2019 Components: @@ -38,10 +38,10 @@ Text Template Transformation C# and Visual Basic Roslyn compilers C++ 2019 Redistributable Update C++ Cmake tools for Windows -C++/CLI support for v142 build tools /14.26) +C++/CLI support for v142 build tools /14.28) MSBuild MSVC v142 - VS 2019 C++ ARM build tools (v14.20) -MSVC v142 - VS 2019 C++ ARM build tools (v14.26) +MSVC v142 - VS 2019 C++ ARM build tools (v14.28) MSVC v142 - VS 2019 C++ ARM64 build tools (v14.20) MSVC v142 - VS 2019 C++ ARM64 build tools (v14.26) MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.20) @@ -57,7 +57,7 @@ Razor Language Services Graphics debugger and GPU profiler for DirectX Image and 3D model editors C++ ATL for latest v142 build tools (x86 & x64) -TypeScript 3.8 SDK +TypeScript 4.0 SDK Windows 10 SDK (10.0.16299.0) Windows 10 SDK (10.0.17134.0) Windows 10 SDK (10.0.17763.0) diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/virtio.txt b/coin/pre-provisioning/qtci-windows-10-x86_64/virtio.txt index 4692e4a3..61c89933 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/virtio.txt +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/virtio.txt @@ -4,18 +4,22 @@ Our vanilla images are pre-installed in VMware where we have networking availabl use the VMware installed vmxnet3 NIC to fetch VirtIO drivers, install them, and only then switch to using the VirtIO NIC in KVM. -* Download https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win-0.1.171.iso -* Mount virtio-win-0.1.171.iso by double clicking it. +NOTE! Install these Virtio drivers in Opennebula when using Windows 10 20H2 +* Download https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.185-2/virtio-win-0.1.185.iso + cache: http://ci-files01-hki.ci.local/input/windows/virtio/virtio-win-0.1.185.iso +* Mount virtio-win-0.1.185.iso by double clicking it. * Right click 'E:\NetKVM\w10\amd64\netkvm.inf' and select Install * Right click 'E:\Balloon\w10\amd64\balloon.inf' and select Install - * Right click 'E:\vioscsi\w10\amd64\vioscsi.inf' and select Install +* Right click 'E:\vioserial\w10\amd64\vioser.inf' and select Install +* Navigate to E:\guest-agent directory and double click qemu-ga-x86_64 Because vioscsi does not install the entries in windows registry before we actually have a VirtIO device installed, and we can't boot with a VirtIO device before the driver is installed, we have to blindly install the registry entries: * Download https://bugreports.qt.io/secure/attachment/95685/95685_vioscsi.reg + cache: http://ci-files01-hki.intra.qt.io/input/windows/virtio/vioscsi.reg However, we've seen that the Owner in the registry can be wrong. This entry sets it to oem11.inf, but we've seen it be oem10.inf in one case and it has diff --git a/coin/provisioning/common/windows/disable-netadapterlso.ps1 b/coin/provisioning/common/windows/disable-netadapterlso.ps1 index 36fff06e..2df955b9 100644 --- a/coin/provisioning/common/windows/disable-netadapterlso.ps1 +++ b/coin/provisioning/common/windows/disable-netadapterlso.ps1 @@ -1,2 +1,2 @@ -Disable-NetAdapterLso Ethernet +Disable-NetAdapterLso "Ethernet 2" Start-Sleep -s 15 # Give windows some time to adjust network settings diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-update-msvc2019.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-update-msvc2019.ps1 deleted file mode 100644 index 3dc1439a..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/05-update-msvc2019.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\update-msvc2019.ps1" |