From 15872ba2cc681d5e869c48fdfffd0573629c2988 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Tue, 6 May 2025 22:11:00 +0300 Subject: [PATCH] Make Windows 11 24H2 x86_64 tests as blocking in CI This change removes 'InsignificantTests' from all 24H2 targets and also adds 'Packaging' to 24H2 targets that have 'Packaging' in equivalent 23H2 targets. [CI Platforms] Pick-to: 6.10 Task-number: QTQAINFRA-6734 Change-Id: I6056ddafcb351875d297ab52565e6b20ba75bb2b Reviewed-by: Tero Heikkinen Reviewed-by: Jukka Jokiniva --- coin/platform_configs/cmake_platforms.yaml | 10 +++++----- .../cmake_platforms_static_release.yaml | 2 +- .../platform_configs/cmake_platforms_static_tests.yaml | 2 +- coin/platform_configs/nightly_unity_builds.yaml | 2 +- coin/platform_configs/qt-creator.yaml | 4 ++-- coin/platform_configs/qtgradleplugin.yaml | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 220dae99..92bbf144 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -189,7 +189,7 @@ Configurations: Id: 'windows-11_24H2-msvc2022' Template: 'qtci-windows-11_24H2-x86_64-71' Compiler: 'MSVC2022' - Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests'] + Features: ['Sccache', 'Packaging', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..', @@ -235,7 +235,7 @@ Configurations: Template: 'qtci-windows-11_24H2-x86_64-71' Compiler: 'MSVC2022' Target arch: 'arm64' - Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests'] + Features: ['Sccache', 'Packaging', 'DisableTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Platform dependency: 'windows-11_24H2-msvc2022' Environment variables: [ 'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer', @@ -274,7 +274,7 @@ Configurations: Id: 'windows-11_24H2-msvc2022-developer-build' Template: 'qtci-windows-11_24H2-x86_64-71' Compiler: 'MSVC2022' - Features: ['Sccache', 'DebugAndRelease', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples', 'InsignificantTests'] + Features: ['Sccache', 'DebugAndRelease', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples'] Configure arguments: '-debug-and-release -force-asserts -make examples -developer-build -force-debug-info -qt-zlib -c++std c++20' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}', @@ -361,7 +361,7 @@ Configurations: Id: 'windows-11_24H2-llvm' Template: 'qtci-windows-11_24H2-x86_64-71' Compiler: 'Clang' - Features: ['Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests'] + Features: ['Sccache', 'Packaging', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples' Environment variables: [ 'Path=C:\llvm-mingw\bin;{{.Env.Path}}', @@ -387,7 +387,7 @@ Configurations: Id: 'windows-11_24H2-mingw13-developer-build' Template: 'qtci-windows-11_24H2-x86_64-71' Compiler: 'Mingw' - Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples', 'InsignificantTests'] + Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples'] Configure arguments: '-developer-build -release -force-asserts -force-debug-info -separate-debug-info -make examples' Environment variables: [ 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', diff --git a/coin/platform_configs/cmake_platforms_static_release.yaml b/coin/platform_configs/cmake_platforms_static_release.yaml index c58d7e95..c5abd701 100644 --- a/coin/platform_configs/cmake_platforms_static_release.yaml +++ b/coin/platform_configs/cmake_platforms_static_release.yaml @@ -19,7 +19,7 @@ Configurations: Id: 'windows-11_24H2-msvc2022-minimal-static-test' Template: 'qtci-windows-11_24H2-x86_64-71' Compiler: 'MSVC2022' - Features: ['Sccache', 'UseConfigure', 'MinimalStaticTests', 'InsignificantTests'] + Features: ['Sccache', 'Packaging', 'UseConfigure', 'MinimalStaticTests'] Configure arguments: '-static -release -headersclean -nomake examples -qt-libjpeg -no-icu -qt-doubleconversion -qt-zlib -c++std c++20 -no-feature-sql-psql' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..', diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml index 5cbc10e0..61e60135 100644 --- a/coin/platform_configs/cmake_platforms_static_tests.yaml +++ b/coin/platform_configs/cmake_platforms_static_tests.yaml @@ -29,7 +29,7 @@ Configurations: Id: 'windows-11_24H2-minimal-static' Template: 'qtci-windows-11_24H2-x86_64-71' Compiler: 'MSVC2022' - Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure', 'InsignificantTests'] + Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure'] Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..', diff --git a/coin/platform_configs/nightly_unity_builds.yaml b/coin/platform_configs/nightly_unity_builds.yaml index e547d2b6..3d35bae0 100644 --- a/coin/platform_configs/nightly_unity_builds.yaml +++ b/coin/platform_configs/nightly_unity_builds.yaml @@ -16,7 +16,7 @@ Configurations: Id: 'windows-11_24H2-msvc2022-unity-build' Template: 'qtci-windows-11_24H2-x86_64-71' Compiler: 'MSVC2022' - Features: ['Sccache', 'Debug', 'UseConfigure', 'DoNotRunTests', 'InsignificantTests'] + Features: ['Sccache', 'Debug', 'UseConfigure', 'DoNotRunTests'] Configure arguments: '-debug -force-debug-info -headersclean -make examples -qt-zlib' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DQT_UNITY_BUILD=ON', diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml index 4378c2a9..726892cd 100644 --- a/coin/platform_configs/qt-creator.yaml +++ b/coin/platform_configs/qt-creator.yaml @@ -11,7 +11,7 @@ Configurations: - Template: 'qtci-windows-11_24H2-x86_64-71' Compiler: 'MSVC2022' - Features: ['Sccache', 'DebugAndRelease', 'InsignificantTests'] + Features: ['Sccache', 'DebugAndRelease'] Configure arguments: '' Environment variables: [] Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] @@ -59,7 +59,7 @@ Configurations: - Template: 'qtci-windows-11_24H2-x86_64-71' Compiler: 'MSVC2022' - Features: ['Sccache', 'DebugAndRelease', 'OldestQt', 'InsignificantTests'] + Features: ['Sccache', 'DebugAndRelease', 'OldestQt'] Configure arguments: '' Environment variables: [] Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] diff --git a/coin/platform_configs/qtgradleplugin.yaml b/coin/platform_configs/qtgradleplugin.yaml index ca943383..1305e41b 100644 --- a/coin/platform_configs/qtgradleplugin.yaml +++ b/coin/platform_configs/qtgradleplugin.yaml @@ -20,4 +20,4 @@ Configurations: Id: 'qtgp-on-windows-24h2' Template: 'qtci-windows-11_24H2-x86_64-71' Compiler: 'MSVC2022' - Features: ['TestOnly', 'InsignificantTests'] + Features: ['TestOnly']