aboutsummaryrefslogtreecommitdiffstats
path: root/coin/platform_configs
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2022-12-07 13:08:37 +0000
committerHeikki Halmet <heikki.halmet@qt.io>2023-01-03 10:14:17 +0000
commitd2770134a5b8179b281d2666b665ae4895d6adf6 (patch)
tree1da54e7972e0a1697348341a523f9a126f205d95 /coin/platform_configs
parent4b5e5a6cbbe0ea9fc60b8f3b91550ff3de5d53b8 (diff)
Add RHEL 9 to CI
This will replace RHEL 8 Task-number: QTQAINFRA-5111 Change-Id: Ib65e9b7a2afa85418d5113261bc83ba915b2bce0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> (cherry picked from commit 5880c423c834819306b446f79df15edb361b73c4) Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Diffstat (limited to 'coin/platform_configs')
-rw-r--r--coin/platform_configs/cmake_platforms.yaml4
-rw-r--r--coin/platform_configs/cmake_platforms_target_android.yaml12
-rw-r--r--coin/platform_configs/cmake_platforms_target_android_12.yaml4
-rw-r--r--coin/platform_configs/cmake_platforms_target_android_12_insignificant.yaml4
-rw-r--r--coin/platform_configs/flashing-wizard.yaml2
-rw-r--r--coin/platform_configs/linux_android_tests_developer.yaml4
-rw-r--r--coin/platform_configs/linux_android_tests_multi_abi.yaml16
-rw-r--r--coin/platform_configs/nightly_rhel_9.yaml44
-rw-r--r--coin/platform_configs/qmake2cmake.yaml2
-rw-r--r--coin/platform_configs/qt-creator.yaml4
-rw-r--r--coin/platform_configs/qtsaferenderer.yaml2
-rw-r--r--coin/platform_configs/tqtc-android-automotive.yaml8
12 files changed, 31 insertions, 75 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml
index 7d4419d6..7477e345 100644
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -147,8 +147,8 @@ Configurations:
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
]
-
- Id: 'RHEL-8.4-host'
- Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+ Id: 'RHEL-9.0-host'
+ Template: 'qtci-linux-RHEL-9.0-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 119cf580..cccae1be 100644
--- a/coin/platform_configs/cmake_platforms_target_android.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android.yaml
@@ -35,13 +35,13 @@ Configurations:
'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
]
-
- Id: 'RHEL-8.4-Android-x86'
- Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+ Id: 'RHEL-9.0-Android-x86'
+ Template: 'qtci-linux-RHEL-9.0-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86'
Compiler: 'GCC'
Target compiler: 'Clang'
- Platform dependency: 'RHEL-8.4-host'
+ Platform dependency: 'RHEL-9.0-host'
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',
@@ -52,13 +52,13 @@ Configurations:
'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
]
-
- Id: 'RHEL-8.4-Android-x86_64'
- Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+ Id: 'RHEL-9.0-Android-x86_64'
+ Template: 'qtci-linux-RHEL-9.0-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86_64'
Compiler: 'GCC'
Target compiler: 'Clang'
- Platform dependency: 'RHEL-8.4-host'
+ Platform dependency: 'RHEL-9.0-host'
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 45150ddb..0e02c872 100644
--- a/coin/platform_configs/cmake_platforms_target_android_12.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android_12.yaml
@@ -1,12 +1,12 @@
Version: 2
Configurations:
-
- Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+ Template: 'qtci-linux-RHEL-9.0-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86_64'
Compiler: 'GCC'
Target compiler: 'Clang'
- Platform dependency: 'RHEL-8.4-host'
+ Platform dependency: 'RHEL-9.0-host'
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 ecaa6038..e03fde43 100644
--- a/coin/platform_configs/cmake_platforms_target_android_12_insignificant.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android_12_insignificant.yaml
@@ -1,12 +1,12 @@
Version: 2
Configurations:
-
- Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+ Template: 'qtci-linux-RHEL-9.0-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86_64'
Compiler: 'GCC'
Target compiler: 'Clang'
- Platform dependency: 'RHEL-8.4-host'
+ Platform dependency: 'RHEL-9.0-host'
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 9a09411d..de40e8e1 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-8.4-x86_64-50'
+ Template: 'qtci-linux-RHEL-9.0-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 d3ccba2b..89c85fe8 100644
--- a/coin/platform_configs/linux_android_tests_developer.yaml
+++ b/coin/platform_configs/linux_android_tests_developer.yaml
@@ -1,12 +1,12 @@
Version: 2
Configurations:
-
- Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+ Template: 'qtci-linux-RHEL-9.0-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86'
Compiler: 'GCC'
Target compiler: 'Clang'
- Platform dependency: 'RHEL-8.4-host'
+ Platform dependency: 'RHEL-9.0-host'
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 37498e6b..f7857ece 100644
--- a/coin/platform_configs/linux_android_tests_multi_abi.yaml
+++ b/coin/platform_configs/linux_android_tests_multi_abi.yaml
@@ -1,16 +1,16 @@
Version: 2
Configurations:
-
- Id: 'RHEL_Android_Multi'
- Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+ Id: 'RHEL_9_Android_Multi'
+ Template: 'qtci-linux-RHEL-9.0-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'multi'
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: [
- 'RHEL-8.4-host',
- 'RHEL-8.4-Android-x86',
- 'RHEL-8.4-Android-x86_64'
+ 'RHEL-9.0-host',
+ 'RHEL-9.0-Android-x86',
+ 'RHEL-9.0-Android-x86_64'
]
Features: [
'Sccache',
@@ -19,8 +19,8 @@ Configurations:
'InstallDepsPerPlatformSubdir'
]
Environment variables: [
- 'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_RHEL-8.4-host',
- 'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_RHEL-8.4-Android-x86',
- 'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_RHEL-8.4-Android-x86_64',
+ 'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_RHEL-9.0-host',
+ 'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_RHEL-9.0-Android-x86',
+ 'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_RHEL-9.0-Android-x86_64',
'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"'
]
diff --git a/coin/platform_configs/nightly_rhel_9.yaml b/coin/platform_configs/nightly_rhel_9.yaml
deleted file mode 100644
index cd5e6f98..00000000
--- a/coin/platform_configs/nightly_rhel_9.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-Version: 2
-Configurations:
--
- Id: 'RHEL-9.0-host'
- Template: 'qtci-linux-RHEL-9.0-x86_64-50'
- Compiler: 'GCC'
- Features: ['Packaging', 'Sccache', 'UseConfigure']
- 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',
- 'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
- 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
- ]
--
- Template: 'qtci-linux-RHEL-9.0-x86_64-50'
- Target os: 'Android_ANY'
- Target arch: 'x86'
- Compiler: 'GCC'
- Target compiler: 'Clang'
- Platform dependency: 'RHEL-9.0-host'
- 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}}',
- 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
- 'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86-clang',
- 'ANDROID_EMULATOR=@emulator_x86_api_23',
- 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
- ]
--
- Template: 'qtci-linux-RHEL-9.0-x86_64-50'
- Target os: 'Android_ANY'
- Target arch: 'x86_64'
- Compiler: 'GCC'
- Target compiler: 'Clang'
- Platform dependency: 'RHEL-9.0-host'
- 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',
- 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
- 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
- 'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86_64-clang',
- 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
- ]
diff --git a/coin/platform_configs/qmake2cmake.yaml b/coin/platform_configs/qmake2cmake.yaml
index df23d840..22ded595 100644
--- a/coin/platform_configs/qmake2cmake.yaml
+++ b/coin/platform_configs/qmake2cmake.yaml
@@ -10,7 +10,7 @@ Configurations:
Compiler: 'Clang'
Features: ['DisableTests']
-
- Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+ Template: 'qtci-linux-RHEL-9.0-x86_64-50'
Compiler: 'GCC'
Features: ['DisableTests']
-
diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml
index dbb40b0f..03ab3693 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-8.4-x86_64-50'
+ Template: 'qtci-linux-RHEL-9.0-x86_64-50'
Compiler: 'GCC'
Features: ['Packaging', 'Sccache', 'DebugAndRelease']
Configure arguments: ''
Environment variables: []
-
- Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+ Template: 'qtci-linux-RHEL-9.0-x86_64-50'
Compiler: 'GCC'
Features: ['Qt5', 'Sccache', 'DebugAndRelease']
Configure arguments: ''
diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml
index 75a0c449..b51b1024 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-8.4-x86_64-50'
+ Template: 'qtci-linux-RHEL-9.0-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'
diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml
index 674c5d76..34b8127b 100644
--- a/coin/platform_configs/tqtc-android-automotive.yaml
+++ b/coin/platform_configs/tqtc-android-automotive.yaml
@@ -32,8 +32,8 @@ Configurations:
'CONAN_PROFILE=coin/conan/profiles/macos-universal-clang'
]
-
- Id: 'RHEL-8.4-host'
- Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+ Id: 'RHEL-9.0-host'
+ Template: 'qtci-linux-RHEL-9.0-x86_64-50'
Compiler: 'GCC'
Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'UseConfigure']
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'
@@ -42,12 +42,12 @@ Configurations:
'CONAN_PROFILE=coin/conan/profiles/linux-x86_64-gcc'
]
-
- Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+ Template: 'qtci-linux-RHEL-9.0-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86'
Compiler: 'GCC'
Target compiler: 'Clang'
- Platform dependency: 'RHEL-8.4-host'
+ Platform dependency: 'RHEL-9.0-host'
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',