From 3d536d157de098fbf903bc4a458dc335aaa5c2e8 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 23 Jun 2025 10:38:27 +0200 Subject: [PATCH] Revert "platform_configs: remove two u2204 tests" Ubuntu 24.04 GNOME X11 still has too many flaky issues in our CI, which blocks integrations too much. This reverts commit e2e25e8a66211dea81b4f5b38dde04e8e0560580. Pick-to: 6.9 6.8 Task-number: QTBUG-137909 Change-Id: Ifcb56d0172b7bd0e66d1fe6e764ea6643b8e4834 Reviewed-by: Axel Spoerl (cherry picked from commit da4d20137c62ad2ef9087afc66c494766a405f90) Reviewed-by: Tero Heikkinen Reviewed-by: Jukka Jokiniva --- coin/platform_configs/cmake_platforms.yaml | 13 +++++++++++++ coin/platform_configs/precheck.yaml | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 40850656..62d2ae92 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -25,6 +25,19 @@ Configurations: 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON -DQT_DEPLOY_FFMPEG=TRUE' ] +# Test on Ubuntu 22.04 X11 +- + Id: 'ubuntu-22.04-developer-build-x11-tests' + Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' + Compiler: 'GCC' + Features: ['Sccache', 'TestOnly'] + Platform dependency: 'ubuntu-22.04-developer-build' +- + Id: 'ubuntu-22.04-x11-tests' + Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' + Compiler: 'GCC' + Features: ['Sccache', 'TestOnly'] + Platform dependency: 'ubuntu-22.04' # Build on Ubuntu 24.04 ARM64 Wayland and test on offscreen and Wayland later - Id: 'ubuntu-24.04-arm64-developer-build' diff --git a/coin/platform_configs/precheck.yaml b/coin/platform_configs/precheck.yaml index da9b7b5b..dbd7f25b 100644 --- a/coin/platform_configs/precheck.yaml +++ b/coin/platform_configs/precheck.yaml @@ -4,7 +4,7 @@ Include: [ cmake_platforms.yaml: [ "ubuntu-22.04", "ubuntu-22.04-developer-build", - "ubuntu-24.04-x64-developer-build-x11-tests", + "ubuntu-22.04-developer-build-x11-tests", "windows-11_24H2-msvc2022-developer-build", "ios-universal" ],