From fb0b54a3560c9cac0dba93df398b53ae903be3a6 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Thu, 17 Aug 2023 17:19:42 +0300 Subject: [PATCH] Remove RHEL 8.6 from yaml configurations Removing RHEL 8.6 from yaml configurations at first and scripts will be kept for some time, until removed later. Task-number: QTQAINFRA-5768 Change-Id: I687f96de35b4bfa28d5a520717f29f059c4925c3 (cherry picked from commit 19cbccac8779d5f40b6e084980776d4278067670) Reviewed-by: Rami Potinkara Reviewed-by: Qt CI Bot Reviewed-by: Volker Hilsheimer Reviewed-by: Petri Virkkunen Reviewed-by: Tero Heikkinen --- coin/platform_configs/cmake_platforms.yaml | 10 ------ .../cmake_platforms_target_android.yaml | 32 ------------------- coin/platform_configs/flashing-wizard.yaml | 5 --- .../linux_android_tests_developer.yaml | 15 --------- .../linux_android_tests_multi_abi.yaml | 32 +++---------------- coin/platform_configs/qt-creator.yaml | 6 ---- .../qtsaferenderer-runtime.yaml | 2 +- coin/platform_configs/qtsaferenderer.yaml | 11 +------ .../tqtc-android-automotive.yaml | 19 +---------- 9 files changed, 7 insertions(+), 125 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 69bc0901..97b5d4d9 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -166,16 +166,6 @@ Configurations: 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', 'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}', ] -- - Id: 'rhel-8.6' - Template: 'qtci-linux-RHEL-8.6-x86_64-50' - Compiler: 'GCC' - Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies'] - 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}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_native_grpc=OFF' - ] - Id: 'rhel-8.8' Template: 'qtci-linux-RHEL-8.8-x86_64-50' diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index ab1081fa..63533405 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -33,22 +33,6 @@ Configurations: ] - Id: 'android-6-x86-on-linux' - Template: 'qtci-linux-RHEL-8.6-x86_64-50' - Target os: 'Android_ANY' - Target arch: 'x86' - Compiler: 'GCC' - Target compiler: 'Clang' - Platform dependency: 'rhel-8.6' - Features: ['Packaging', 'Sccache', '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', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', - 'ANDROID_EMULATOR=@emulator_x86_api_23', - 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}' - ] -- - Id: 'android-6-RHEL-8.8-x86-on-linux' Template: 'qtci-linux-RHEL-8.8-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86' @@ -65,22 +49,6 @@ Configurations: ] - Id: 'android-13-x86_64-on-linux' - Template: 'qtci-linux-RHEL-8.6-x86_64-50' - Target os: 'Android_ANY' - Target arch: 'x86_64' - Compiler: 'GCC' - Target compiler: 'Clang' - Platform dependency: 'rhel-8.6' - Features: ['Packaging', 'Sccache', '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', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', - 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}', - 'ANDROID_EMULATOR=@emulator_x86_64_api_33' - ] -- - Id: 'android-13-RHEL-8.8-x86_64-on-linux' Template: 'qtci-linux-RHEL-8.8-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86_64' diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml index b43f5d31..18d281fa 100644 --- a/coin/platform_configs/flashing-wizard.yaml +++ b/coin/platform_configs/flashing-wizard.yaml @@ -23,11 +23,6 @@ Configurations: Target arch: 'x86' Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-qmake -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_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% -static -no-icu' - - - Template: 'qtci-linux-RHEL-8.6-x86_64-50' - Compiler: 'GCC' - 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-RHEL-8.8-x86_64-50' Compiler: 'GCC' diff --git a/coin/platform_configs/linux_android_tests_developer.yaml b/coin/platform_configs/linux_android_tests_developer.yaml index ecb82e81..44127cba 100644 --- a/coin/platform_configs/linux_android_tests_developer.yaml +++ b/coin/platform_configs/linux_android_tests_developer.yaml @@ -2,21 +2,6 @@ Version: 2 Configurations: - Id: 'android-x86-developer-build-testrun-on-linux' - Template: 'qtci-linux-RHEL-8.6-x86_64-50' - Target os: 'Android_ANY' - Target arch: 'x86' - Compiler: 'GCC' - Target compiler: 'Clang' - Platform dependency: 'rhel-8.6' - 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}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF', - 'ANDROID_EMULATOR=@emulator_x86_api_23'] -- - Id: 'android-x86-developer-build-testrun-on-linux-RHEL-8.8' Template: 'qtci-linux-RHEL-8.8-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86' diff --git a/coin/platform_configs/linux_android_tests_multi_abi.yaml b/coin/platform_configs/linux_android_tests_multi_abi.yaml index 6313cb14..882c5742 100644 --- a/coin/platform_configs/linux_android_tests_multi_abi.yaml +++ b/coin/platform_configs/linux_android_tests_multi_abi.yaml @@ -1,14 +1,14 @@ Version: 2 Configurations: - - Id: 'rhel_8.4_android_multi' - Template: 'qtci-linux-RHEL-8.6-x86_64-50' + Id: 'rhel_8.8_android_multi' + Template: 'qtci-linux-RHEL-8.8-x86_64-50' Target os: 'Android_ANY' Target arch: 'multi' Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: [ - 'rhel-8.6', + 'rhel-8.8', 'android-6-x86-on-linux', 'android-13-x86_64-on-linux' ] @@ -19,33 +19,9 @@ Configurations: 'InstallDepsPerPlatformSubdir' ] Environment variables: [ - 'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.6', + 'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.8', 'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-6-x86-on-linux', 'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-13-x86_64-on-linux', 'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"', 'ANDROID_EMULATOR=@emulator_x86_api_23' ] -- - Id: 'rhel_8.8_android_multi' - Template: 'qtci-linux-RHEL-8.8-x86_64-50' - Target os: 'Android_ANY' - Target arch: 'multi' - Compiler: 'GCC' - Target compiler: 'Clang' - Platform dependency: [ - 'rhel-8.8', - 'android-6-RHEL-8.8-x86-on-linux', - 'android-13-RHEL-8.8-x86_64-on-linux' - ] - Features: [ - 'Sccache', - 'AndroidTestRun', - 'MinimalAndroidMultiABITests', - 'InstallDepsPerPlatformSubdir' - ] - Environment variables: [ - 'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.8', - 'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-6-RHEL-8.8-x86-on-linux', - 'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-13-RHEL-8.8-x86_64-on-linux', - 'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"' - ] diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml index e990a0c6..03cb927f 100644 --- a/coin/platform_configs/qt-creator.yaml +++ b/coin/platform_configs/qt-creator.yaml @@ -15,12 +15,6 @@ Configurations: Configure arguments: '' Environment variables: [] Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'x86'] -- - Template: 'qtci-linux-RHEL-8.6-x86_64-50' - Compiler: 'GCC' - Features: ['Packaging', 'Sccache', 'DebugAndRelease'] - Configure arguments: '' - Environment variables: [] - Template: 'qtci-linux-RHEL-8.8-x86_64-50' Compiler: 'GCC' diff --git a/coin/platform_configs/qtsaferenderer-runtime.yaml b/coin/platform_configs/qtsaferenderer-runtime.yaml index 5729a624..56ed1c66 100644 --- a/coin/platform_configs/qtsaferenderer-runtime.yaml +++ b/coin/platform_configs/qtsaferenderer-runtime.yaml @@ -13,7 +13,7 @@ Include: [ "windows-10_22h2-msvc2019", "windows-10_22h2-msvc2022", "windows-10_22h2-msvc2019-developer-build", - "rhel-8.4", + "rhel-8.8", "windows-10_22h2-mingw11", "windows-10_22h2-mingw11-developer-build", "windows-10_22h2-llvm", diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 5278a4de..d8cdbab5 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -12,7 +12,7 @@ Include: [ "sles-15_sp5-static", "windows-10_22h2-msvc2019", "windows-10_22h2-msvc2022", - "rhel-8.4", + "rhel-8.8", "windows-10_22h2-mingw11", "windows-10_22h2-llvm", "windows-11_22h2-msvc2019" @@ -35,15 +35,6 @@ Configurations: Environment variables: [ 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"' ] -- - Id: 'Linux-RHEL_8_6_Static' - Template: 'qtci-linux-RHEL-8.6-x86_64-50' - Compiler: 'GCC' - 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' - ] - Id: 'Linux-RHEL_8_8_Static' Template: 'qtci-linux-RHEL-8.8-x86_64-50' diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index c8205fdf..5b6806b4 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -1,7 +1,6 @@ Version: 2 Include: [ cmake_platforms.yaml: [ - 'rhel-8.6', 'rhel-8.8', 'windows-10_22h2-mingw11', 'ubuntu-22.04-documentation', @@ -19,23 +18,7 @@ Include: [ ] Configurations: - - Id: "automotive-android-12-x86_64-on-linux" - Template: 'qtci-linux-RHEL-8.6-x86_64-50' - Target os: 'Android_ANY' - Target arch: 'x86_64' - Compiler: 'GCC' - Target compiler: 'Clang' - Platform dependency: 'rhel-8.6' - Features: ['Packaging', 'Sccache', '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}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', - 'ANDROID_EMULATOR=@automotive_emulator_x86_64_api_31' - ] -- - Id: "automotive-android-12-x86_64-on-linux-RHEL-8.8" + Id: "automotive-android-13-x86_64-on-linux" Template: 'qtci-linux-RHEL-8.8-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86_64'