From 685618928761443958e828e36a63ec517e1be8f9 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Fri, 28 Nov 2025 13:37:16 +0200 Subject: [PATCH] Set Red Hat 9.6 tests as blocking Also set Packaging targets for RHEL-9.6. [CI Platforms] Task-number: QTQAINFRA-7326 Task-number: QTQAINFRA-7331 Change-Id: I18ec1e79e6fbe7b4ed001a3cdb648dae37b89561 Reviewed-by: Tero Heikkinen --- coin/platform_configs/android-studio-tools.yaml | 2 +- coin/platform_configs/cmake_platforms.yaml | 2 +- coin/platform_configs/cmake_platforms_target_android.yaml | 4 ++-- coin/platform_configs/linux_android_tests_developer.yaml | 2 +- coin/platform_configs/qtgradleplugin.yaml | 2 +- coin/platform_configs/qtsaferenderer.yaml | 2 +- coin/platform_configs/tqtc-android-automotive.yaml | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/coin/platform_configs/android-studio-tools.yaml b/coin/platform_configs/android-studio-tools.yaml index 86fd8815..be04d094 100644 --- a/coin/platform_configs/android-studio-tools.yaml +++ b/coin/platform_configs/android-studio-tools.yaml @@ -10,4 +10,4 @@ Configurations: Id: 'qttas-on-linux-rhel_9_6' Template: 'qtci-linux-RHEL-9.6-x86_64-51' Compiler: 'GCC' - Features: ['UseConfigure', 'DisableTests'] + Features: ['UseConfigure', 'Packaging', 'DisableTests'] diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 4888d035..ef529dc3 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -286,7 +286,7 @@ Configurations: Id: 'rhel-9.6' Template: 'qtci-linux-RHEL-9.6-x86_64-51' Compiler: 'GCC' - Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure'] + Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput' Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 27030a3e..7cec056a 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -58,7 +58,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'rhel-9.6' - Features: ['Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'JavaDocs', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure'] + Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'JavaDocs'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86', 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', @@ -112,7 +112,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'rhel-9.6' - Features: ['Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure'] + Features: ['Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64', 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', diff --git a/coin/platform_configs/linux_android_tests_developer.yaml b/coin/platform_configs/linux_android_tests_developer.yaml index cfe28ba0..8b2bb842 100644 --- a/coin/platform_configs/linux_android_tests_developer.yaml +++ b/coin/platform_configs/linux_android_tests_developer.yaml @@ -23,7 +23,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'rhel-9.6' - Features: ['Sccache', 'AndroidTestRun', 'UseConfigure', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure'] + Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'UseConfigure'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -debug -developer-build -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86', 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}}', diff --git a/coin/platform_configs/qtgradleplugin.yaml b/coin/platform_configs/qtgradleplugin.yaml index 74035fb6..0e1d6c7b 100644 --- a/coin/platform_configs/qtgradleplugin.yaml +++ b/coin/platform_configs/qtgradleplugin.yaml @@ -10,7 +10,7 @@ Configurations: Id: 'qtgp-on-linux-rhel_9_6' Template: 'qtci-linux-RHEL-9.6-x86_64-51' Compiler: 'GCC' - Features: ['TestOnly', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure'] + Features: ['TestOnly'] - Id: 'qtgp-on-macos' Template: 'qtci-macos-14-arm-106' diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index eddf85a9..8c9ebe78 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -54,7 +54,7 @@ Configurations: Id: 'Linux-RHEL_9_6_Static' Template: 'qtci-linux-RHEL-9.6-x86_64-51' Compiler: 'GCC' - Features: ['Sccache', 'UseConfigure', 'MinimalStaticTests', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure'] + Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests'] Configure arguments: '-static -no-icu -nomake examples -release -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -no-sql-mysql' Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index 4d682238..ff431ac8 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -58,7 +58,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'rhel-9.6' - Features: ['Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure'] + Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64', 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}}', @@ -74,7 +74,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'rhel-9.6' - Features: ['Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure'] + Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64', 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}}',