From ccca79aa5ec39e122cd806c37586b60d1cfe54a4 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 30 Aug 2024 10:50:27 +0200 Subject: [PATCH] platform_configs: drop 3 tests configs on debian-11 arm64 Change-Id: Ie9981ec2760780779a328370acb81fdb664e71a1 Reviewed-by: Jani Heikkinen (cherry picked from commit a32af8a106f39ccd767fec15fe0ae82ff3b0e423) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms.yaml | 12 ------------ coin/platform_configs/qt5.yaml | 12 +----------- coin/platform_configs/qtwayland.yaml | 10 ---------- 3 files changed, 1 insertion(+), 33 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index a438abb7..21d81328 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -193,18 +193,6 @@ Configurations: Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', ] -# Test on Debian-11.6 offscreen -- - Id: 'debian-11.6-arm64-offscreen-tests' - Template: 'qtci-linux-Debian-11.6-aarch64-50' - Compiler: 'GCC' - Features: ['Sccache', 'InsignificantTests', 'TestOnly'] - Environment variables: [ - 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', - 'QT_QPA_OFFSCREEN_NO_GLX=1', - 'QT_QPA_PLATFORM=offscreen' - ] - Platform dependency: 'debian-11.6-arm64' - Id: 'ios-universal' Template: 'qtci-macos-13-x86_64-103' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index 512c7051..7e8e4a89 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -3,14 +3,4 @@ Include: [ cmake_platforms.yaml, address_sanitizer_platforms.yaml ] -Configurations: -# Test on Debian-11.6 Wayland -- - Id: 'debian-11.6-arm64-wayland-tests' - Template: 'qtci-linux-Debian-11.6-aarch64-50' - Compiler: 'GCC' - Features: ['Sccache', 'TestOnly', 'RunDependencyTests', 'InsignificantTests'] - Environment variables: [ - 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY' - ] - Platform dependency: 'debian-11.6-arm64' +Configurations: [] diff --git a/coin/platform_configs/qtwayland.yaml b/coin/platform_configs/qtwayland.yaml index d2781a34..97373aae 100644 --- a/coin/platform_configs/qtwayland.yaml +++ b/coin/platform_configs/qtwayland.yaml @@ -43,13 +43,3 @@ Configurations: Compiler: 'GCC' Features: ['TestOnly', 'RunDependencyTests', 'InsignificantTests'] Platform dependency: 'ubuntu-24.04-x64' -# Test on Debian-11.6 Wayland -- - Id: 'debian-11.6-arm64-wayland-tests' - Template: 'qtci-linux-Debian-11.6-aarch64-50' - Compiler: 'GCC' - Features: ['Sccache', 'TestOnly', 'RunDependencyTests', 'InsignificantTests'] - Environment variables: [ - 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY' - ] - Platform dependency: 'debian-11.6-arm64'