From e4cc5bd5c106d2a4f1618938498d989fff4a8d8d Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Wed, 21 May 2025 11:27:39 +0200
Subject: [PATCH] platform_configs: remove two u2204 tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We already have two tests on u2404.

Replace the usage of ubuntu-22.04-developer-build-x11-tests with u2404
one.

Pick-to: 6.9 6.8
Task-number: QTQAINFRA-7146
Change-Id: Ib3b1888e1bbb70637432ac70f6116b723e71320d
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit e2e25e8a66211dea81b4f5b38dde04e8e0560580)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 coin/platform_configs/cmake_platforms.yaml | 13 -------------
 coin/platform_configs/precheck.yaml        |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml
index 69da7e00..9cd88fa6 100644
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -25,19 +25,6 @@ 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 0f4bfabb..c070d269 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-22.04-developer-build-x11-tests",
+    "ubuntu-24.04-x64-developer-build-x11-tests",
     "windows-11_23H2-msvc2022-developer-build",
     "windows-11_24H2-msvc2022-developer-build",
     "ios-universal"