From 66f09bb69d05995e1254beea5cfbc9b840c506c5 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Thu, 3 Oct 2024 13:23:56 +0300 Subject: [PATCH] Remove Red Hat 9.2 from CI RHEL-9.2 targets are replaced by RHEL-9.4 targets in platform configurations. [CI Platforms] Pick-to: 6.8 Task-number: QTQAINFRA-6362 Change-Id: I9287309fe136e9aaae6c0c970cc0859dbfaf8635 Reviewed-by: Heikki Halmet Reviewed-by: Tero Heikkinen --- coin/platform_configs/cmake_platforms.yaml | 11 ----------- coin/platform_configs/qmake2cmake.yaml | 4 ---- .../qtbase-new-compiler-testing.yaml | 13 +------------ 3 files changed, 1 insertion(+), 27 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 344f73c7..87d12bd6 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -212,17 +212,6 @@ Configurations: 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON' ] - -- - Id: 'rhel-9.2' - Template: 'qtci-linux-RHEL-9.2-x86_64-51' - Compiler: 'GCC' - Features: ['PinCores', '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', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON' - ] - Id: 'rhel-9.4' Template: 'qtci-linux-RHEL-9.4-x86_64-50' diff --git a/coin/platform_configs/qmake2cmake.yaml b/coin/platform_configs/qmake2cmake.yaml index 82674ec9..9ffcbaee 100644 --- a/coin/platform_configs/qmake2cmake.yaml +++ b/coin/platform_configs/qmake2cmake.yaml @@ -9,10 +9,6 @@ Configurations: Template: 'qtci-macos-13-x86_64-103' Compiler: 'Clang' Features: ['DisableTests'] -- - Template: 'qtci-linux-RHEL-9.2-x86_64-51' - Compiler: 'GCC' - Features: ['DisableTests'] - Template: 'qtci-linux-RHEL-9.4-x86_64-50' Compiler: 'GCC' diff --git a/coin/platform_configs/qtbase-new-compiler-testing.yaml b/coin/platform_configs/qtbase-new-compiler-testing.yaml index b338bdd2..7ee65d85 100644 --- a/coin/platform_configs/qtbase-new-compiler-testing.yaml +++ b/coin/platform_configs/qtbase-new-compiler-testing.yaml @@ -1,17 +1,6 @@ Version: 2 Configurations: -# Test gcc-12 on RHEL 9.2 -- - Id: 'rhel-9.2-gcc12' - Template: 'qtci-linux-RHEL-9.2-x86_64-51' - Compiler: 'GCC' - Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests'] - Configure arguments: '-developer-build -nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-pcre -no-libudev -bundled-xcb-xinput' - Environment variables: [ - 'PATH=/opt/rh/gcc-toolset-12/root/usr/bin/:{{.Env.PATH}}', - 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON' - ] +# Test gcc-12 on RHEL 9.4 - Id: 'rhel-9.4-gcc12' Template: 'qtci-linux-RHEL-9.4-x86_64-50'