From 1bb2928c45825a313c9b273d37d2a01c35a87bb8 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 17 Jan 2023 10:01:05 +0000 Subject: Change RHEL 9.0 to RHEL 8.4 for packaging targets RHEL 9 is causing glibc issue with older linux distros. Let's revert back to use the older RHEL version. For Android targets we can still use RHEL 9 Task-number: QTBUG-110172 Change-Id: I6d61a550fceaab4946e27bd8806263ccfa38a6e6 Reviewed-by: Jani Heikkinen (cherry picked from commit 1759420accb3c67614f3d089323928437b79b3b1) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms.yaml | 4 ++-- coin/platform_configs/cmake_platforms_target_android.yaml | 4 ++-- coin/platform_configs/cmake_platforms_target_android_12.yaml | 2 +- .../cmake_platforms_target_android_12_insignificant.yaml | 2 +- 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 | 4 ++-- coin/platform_configs/qt-creator.yaml | 4 ++-- coin/platform_configs/qtsaferenderer.yaml | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 2eae409e..ee42b4de 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -156,8 +156,8 @@ Configurations: 'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}', ] - - Id: 'rhel-9.0' - Template: 'qtci-linux-RHEL-9.0-x86_64-50' + Id: 'rhel-8.4' + Template: 'qtci-linux-RHEL-8.4-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' diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 76b435c2..76bd29df 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -42,7 +42,7 @@ Configurations: Target arch: 'x86' Compiler: 'GCC' Target compiler: 'Clang' - Platform dependency: 'rhel-9.0' + Platform dependency: 'rhel-8.4' 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', @@ -60,7 +60,7 @@ Configurations: Target arch: 'x86_64' Compiler: 'GCC' Target compiler: 'Clang' - Platform dependency: 'rhel-9.0' + Platform dependency: 'rhel-8.4' Features: ['Packaging', 'Sccache', 'DisableTests', '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', diff --git a/coin/platform_configs/cmake_platforms_target_android_12.yaml b/coin/platform_configs/cmake_platforms_target_android_12.yaml index 64576f37..bf748603 100644 --- a/coin/platform_configs/cmake_platforms_target_android_12.yaml +++ b/coin/platform_configs/cmake_platforms_target_android_12.yaml @@ -7,7 +7,7 @@ Configurations: Target arch: 'x86_64' Compiler: 'GCC' Target compiler: 'Clang' - Platform dependency: 'rhel-9.0' + Platform dependency: 'rhel-8.4' 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', diff --git a/coin/platform_configs/cmake_platforms_target_android_12_insignificant.yaml b/coin/platform_configs/cmake_platforms_target_android_12_insignificant.yaml index 90fe62cd..3479ce52 100644 --- a/coin/platform_configs/cmake_platforms_target_android_12_insignificant.yaml +++ b/coin/platform_configs/cmake_platforms_target_android_12_insignificant.yaml @@ -6,7 +6,7 @@ Configurations: Target arch: 'x86_64' Compiler: 'GCC' Target compiler: 'Clang' - Platform dependency: 'rhel-9.0' + Platform dependency: 'rhel-8.4' Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'InsignificantTests'] 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', diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml index de40e8e1..9a09411d 100644 --- a/coin/platform_configs/flashing-wizard.yaml +++ b/coin/platform_configs/flashing-wizard.yaml @@ -24,7 +24,7 @@ Configurations: 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-9.0-x86_64-50' + Template: 'qtci-linux-RHEL-8.4-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' diff --git a/coin/platform_configs/linux_android_tests_developer.yaml b/coin/platform_configs/linux_android_tests_developer.yaml index f1e5ed13..bed08bec 100644 --- a/coin/platform_configs/linux_android_tests_developer.yaml +++ b/coin/platform_configs/linux_android_tests_developer.yaml @@ -7,7 +7,7 @@ Configurations: Target arch: 'x86' Compiler: 'GCC' Target compiler: 'Clang' - Platform dependency: 'rhel-9.0' + Platform dependency: 'rhel-8.4' 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', diff --git a/coin/platform_configs/linux_android_tests_multi_abi.yaml b/coin/platform_configs/linux_android_tests_multi_abi.yaml index 96c7df45..df6be290 100644 --- a/coin/platform_configs/linux_android_tests_multi_abi.yaml +++ b/coin/platform_configs/linux_android_tests_multi_abi.yaml @@ -8,7 +8,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: [ - 'rhel-9.0', + 'rhel-8.4', 'android-x86-on-linux', 'android-x86_64-on-linux' ] @@ -19,7 +19,7 @@ Configurations: 'InstallDepsPerPlatformSubdir' ] Environment variables: [ - 'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-9.0', + 'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.4', 'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-x86-on-linux', 'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-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 03ab3693..6ed1bcfb 100644 --- a/coin/platform_configs/qt-creator.yaml +++ b/coin/platform_configs/qt-creator.yaml @@ -16,13 +16,13 @@ Configurations: Environment variables: [] Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'x86'] - - Template: 'qtci-linux-RHEL-9.0-x86_64-50' + Template: 'qtci-linux-RHEL-8.4-x86_64-50' Compiler: 'GCC' Features: ['Packaging', 'Sccache', 'DebugAndRelease'] Configure arguments: '' Environment variables: [] - - Template: 'qtci-linux-RHEL-9.0-x86_64-50' + Template: 'qtci-linux-RHEL-9.0-x86_64-500' Compiler: 'GCC' Features: ['Qt5', 'Sccache', 'DebugAndRelease'] Configure arguments: '' diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index b51b1024..75a0c449 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -13,7 +13,7 @@ Configurations: Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -static -nomake tests -nomake examples -no-icu -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% -platform win32-g++' - - Template: 'qtci-linux-RHEL-9.0-x86_64-50' + Template: 'qtci-linux-RHEL-8.4-x86_64-50' Compiler: 'GCC' Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan' -- cgit v1.2.3