From cf1a53776ddb25763610a2e01b5388e3bc0c9f78 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Tue, 6 Aug 2024 15:40:27 +0300 Subject: [PATCH] Make Red Hat 8.10 tests as blocking in CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 'InsignificantTests' is removed from all RHEL-8.10 targets and 'Packaging' feature is added to packaging RHEL-8.10 targets. [CI Platforms] Task-number: QTQAINFRA-6367 Change-Id: I0a83ccf5b75c7f2c7c8de871c267d286cf3a9296 (cherry picked from commit f221e65cf41109a8550588b6da068fc8dda9731d) Reviewed-by: Simo Fält Reviewed-by: Tero Heikkinen --- coin/platform_configs/cmake_platforms.yaml | 2 +- coin/platform_configs/cmake_platforms_target_android.yaml | 4 ++-- coin/platform_configs/flashing-wizard.yaml | 2 +- coin/platform_configs/linux_android_tests_developer.yaml | 2 +- coin/platform_configs/linux_android_tests_multi_abi.yaml | 1 - coin/platform_configs/qt-creator.yaml | 2 +- coin/platform_configs/qtsaferenderer.yaml | 2 +- coin/platform_configs/tqtc-android-automotive.yaml | 4 ++-- 8 files changed, 9 insertions(+), 10 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index c6d57caa..98aa8aed 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -193,7 +193,7 @@ Configurations: Id: 'rhel-8.10' Template: 'qtci-linux-RHEL-8.10-x86_64-50' Compiler: 'GCC' - Features: ['InsignificantTests', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies'] + 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 -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 02190c61..ecc0fe69 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -55,7 +55,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'rhel-8.10' - Features: ['InsignificantTests', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] + Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -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_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', @@ -87,7 +87,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'rhel-8.10' - Features: ['InsignificantTests', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] + Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -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_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml index 4df80178..46595c72 100644 --- a/coin/platform_configs/flashing-wizard.yaml +++ b/coin/platform_configs/flashing-wizard.yaml @@ -31,7 +31,7 @@ Configurations: - Template: 'qtci-linux-RHEL-8.10-x86_64-50' Compiler: 'GCC' - Features: ['InsignificantTests', 'UseLegacyInstructions'] + Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu' - Template: 'qtci-linux-Ubuntu-18.04-x86_64-50' diff --git a/coin/platform_configs/linux_android_tests_developer.yaml b/coin/platform_configs/linux_android_tests_developer.yaml index 9d6a90c0..02fa300a 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-8.10' - Features: ['InsignificantTests', 'Sccache', 'AndroidTestRun', 'UseConfigure'] + Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'UseConfigure'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -debug -developer-build -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -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_DEFAULT}}', diff --git a/coin/platform_configs/linux_android_tests_multi_abi.yaml b/coin/platform_configs/linux_android_tests_multi_abi.yaml index 6b149c53..789bde7f 100644 --- a/coin/platform_configs/linux_android_tests_multi_abi.yaml +++ b/coin/platform_configs/linux_android_tests_multi_abi.yaml @@ -40,7 +40,6 @@ Configurations: ] Features: [ 'Sccache', - 'InsignificantTests', 'WarningsAreErrors', 'AndroidTestRun', 'MinimalAndroidMultiABITests', diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml index eed0f095..0416187b 100644 --- a/coin/platform_configs/qt-creator.yaml +++ b/coin/platform_configs/qt-creator.yaml @@ -24,7 +24,7 @@ Configurations: - Template: 'qtci-linux-RHEL-8.10-x86_64-50' Compiler: 'GCC' - Features: ['InsignificantTests', 'Sccache', 'DebugAndRelease'] + Features: ['Packaging', 'Sccache', 'DebugAndRelease'] Configure arguments: '' Environment variables: [] - diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 3da3fc3a..87eae1c2 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -50,7 +50,7 @@ Configurations: Id: 'Linux-RHEL_8_10_Static' Template: 'qtci-linux-RHEL-8.10-x86_64-50' Compiler: 'GCC' - Features: ['InsignificantTests', 'Sccache', 'UseConfigure', 'MinimalStaticTests'] + 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 f2609502..ec4e54e6 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -44,7 +44,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'rhel-8.10' - Features: ['InsignificantTests', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] + Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -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_DEFAULT}}', @@ -76,7 +76,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'rhel-8.10' - Features: ['InsignificantTests', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] + Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -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_DEFAULT}}',