diff options
| author | Tero Heikkinen <tero.heikkinen@qt.io> | 2023-10-02 10:00:35 +0300 |
|---|---|---|
| committer | Tero Heikkinen <tero.heikkinen@qt.io> | 2023-10-13 11:20:51 +0300 |
| commit | a76778a16d106cb2c99f652c3fc07c6c97799575 (patch) | |
| tree | ea8cf3b559f8840a318ff5f069b9e86ec2298976 | |
| parent | 85c8e49a7e3fbe45ebae1bb661cbb2f36128a006 (diff) | |
Remove SLES 15 SP4 from CI platform configs
SLES 15 SP4 scripts from pre-provisioning and provisioning
will be removed later.
Task-number: QTQAINFRA-5667
Change-Id: Idb49075800e5c3a23804b6df8dd283af3fcbf000
(cherry picked from commit ee054393cea02933bed6ef042ca634a54af64b32)
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| -rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 10 | ||||
| -rw-r--r-- | coin/platform_configs/cmake_platforms_static_tests.yaml | 9 | ||||
| -rw-r--r-- | coin/platform_configs/qtsaferenderer-runtime.yaml | 3 | ||||
| -rw-r--r-- | coin/platform_configs/qtsaferenderer.yaml | 3 |
4 files changed, 2 insertions, 23 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 225c87e4..0e21dddf 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -50,16 +50,6 @@ Configurations: 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' ] - - Id: 'sles-15_sp4-static' - Template: 'qtci-linux-SLES-15_SP4-x86_64-50' - Compiler: 'GCC' - Features: ['Sccache', 'DisableTests', 'UseConfigure'] - Configure arguments: '-nomake examples -static -no-sql-mysql' - Environment variables: [ - 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' - ] -- Id: 'sles-15_sp5-static' Template: 'qtci-linux-SLES-15_SP5-x86_64-50' Compiler: 'GCC' diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml index 4e7eb92e..d3fcf1c8 100644 --- a/coin/platform_configs/cmake_platforms_static_tests.yaml +++ b/coin/platform_configs/cmake_platforms_static_tests.yaml @@ -1,15 +1,6 @@ Version: 2 Configurations: - - Id: 'sles-15_sp4-minimal-static' - Template: 'qtci-linux-SLES-15_SP4-x86_64-50' - Compiler: 'GCC' - Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure'] - Configure arguments: '-nomake examples -static -no-sql-mysql' - Environment variables: [ - 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' - ] -- Id: 'sles-15_sp5-minimal-static' Template: 'qtci-linux-SLES-15_SP5-x86_64-50' Compiler: 'GCC' diff --git a/coin/platform_configs/qtsaferenderer-runtime.yaml b/coin/platform_configs/qtsaferenderer-runtime.yaml index c973ddee..edd0afc8 100644 --- a/coin/platform_configs/qtsaferenderer-runtime.yaml +++ b/coin/platform_configs/qtsaferenderer-runtime.yaml @@ -8,8 +8,7 @@ Include: [ cmake_platforms.yaml: [ "ubuntu-22.04", "ubuntu-22.04-documentation", - "opensuse-15.4-developer-build", - "sles-15_sp4-static", + "opensuse-15.5-developer-build", "sles-15_sp5-static", "windows-10_22h2-msvc2019", "windows-10_22h2-msvc2022", diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index ed4798df..5278a4de 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -8,8 +8,7 @@ Include: [ cmake_platforms.yaml: [ "ubuntu-22.04", "ubuntu-22.04-documentation", - "opensuse-15.4-developer-build", - "sles-15_sp4-static", + "opensuse-15.5-developer-build", "sles-15_sp5-static", "windows-10_22h2-msvc2019", "windows-10_22h2-msvc2022", |