From 293aeab453a6f8e223d3fae8fd20b5566cf60ea9 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Thu, 3 Oct 2024 16:57:30 +0300 Subject: [PATCH] Fix SSH for RHEL-8.10 Red Hat 8.10 VM template -50 does not have a user set for SSH. This is fixed in template -51. Pick-to: 6.8 Change-Id: I602976a0214f6e0f4661e6b876c0710bc3ea9df9 Reviewed-by: Assam Boudjelthia --- coin/platform_configs/cmake_platforms.yaml | 2 +- coin/platform_configs/cmake_platforms_static_release.yaml | 2 +- coin/platform_configs/cmake_platforms_target_android.yaml | 4 ++-- coin/platform_configs/linux_android_tests_developer.yaml | 2 +- coin/platform_configs/linux_android_tests_multi_abi.yaml | 2 +- coin/platform_configs/qt-creator.yaml | 2 +- coin/platform_configs/qtsaferenderer.yaml | 2 +- coin/platform_configs/tqtc-android-automotive.yaml | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 755470bd..c3ef6c1a 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -193,7 +193,7 @@ Configurations: ] - Id: 'rhel-8.10' - Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Template: 'qtci-linux-RHEL-8.10-x86_64-51' Compiler: 'GCC' Features: ['Packaging', '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' diff --git a/coin/platform_configs/cmake_platforms_static_release.yaml b/coin/platform_configs/cmake_platforms_static_release.yaml index 83003911..6bd5f994 100644 --- a/coin/platform_configs/cmake_platforms_static_release.yaml +++ b/coin/platform_configs/cmake_platforms_static_release.yaml @@ -26,7 +26,7 @@ Configurations: ] - Id: 'rhel-8.10-minimal-static-test' - Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Template: 'qtci-linux-RHEL-8.10-x86_64-51' Compiler: 'GCC' Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'MinimalStaticTests'] Configure arguments: '-static -nomake examples -release -qt-libjpeg -no-icu -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput' diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 02006ba3..9995b871 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -33,7 +33,7 @@ Configurations: ] - Id: 'android-9-x86-on-linux' - Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Template: 'qtci-linux-RHEL-8.10-x86_64-51' Target os: 'Android_ANY' Target arch: 'x86' Compiler: 'GCC' @@ -49,7 +49,7 @@ Configurations: ] - Id: 'android-14-x86_64-on-linux' - Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Template: 'qtci-linux-RHEL-8.10-x86_64-51' Target os: 'Android_ANY' Target arch: 'x86_64' Compiler: 'GCC' diff --git a/coin/platform_configs/linux_android_tests_developer.yaml b/coin/platform_configs/linux_android_tests_developer.yaml index 305ef475..3488a44d 100644 --- a/coin/platform_configs/linux_android_tests_developer.yaml +++ b/coin/platform_configs/linux_android_tests_developer.yaml @@ -2,7 +2,7 @@ Version: 2 Configurations: - Id: 'android-x86-developer-build-testrun-on-linux' - Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Template: 'qtci-linux-RHEL-8.10-x86_64-51' Target os: 'Android_ANY' Target arch: 'x86' Compiler: 'GCC' diff --git a/coin/platform_configs/linux_android_tests_multi_abi.yaml b/coin/platform_configs/linux_android_tests_multi_abi.yaml index b6b88d97..4f6e9d3f 100644 --- a/coin/platform_configs/linux_android_tests_multi_abi.yaml +++ b/coin/platform_configs/linux_android_tests_multi_abi.yaml @@ -2,7 +2,7 @@ Version: 2 Configurations: - Id: 'android-9-multi-abi' - Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Template: 'qtci-linux-RHEL-8.10-x86_64-51' Target os: 'Android_ANY' Target arch: 'multi' Compiler: 'GCC' diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml index a0d6d763..95a89747 100644 --- a/coin/platform_configs/qt-creator.yaml +++ b/coin/platform_configs/qt-creator.yaml @@ -16,7 +16,7 @@ Configurations: Environment variables: [] Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] - - Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Template: 'qtci-linux-RHEL-8.10-x86_64-51' Compiler: 'GCC' Features: ['Packaging', 'Sccache', 'DebugAndRelease'] Configure arguments: '' diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 4b0675b9..167b8c0c 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -37,7 +37,7 @@ Configurations: ] - Id: 'Linux-RHEL_8_10_Static' - Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Template: 'qtci-linux-RHEL-8.10-x86_64-51' Compiler: 'GCC' Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests'] Configure arguments: '-static -no-icu -nomake examples -release -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -no-sql-mysql' diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index 4a2ebd21..2d2bfa76 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -19,7 +19,7 @@ Include: [ Configurations: - Id: "automotive-android-14-x86_64-on-linux" - Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Template: 'qtci-linux-RHEL-8.10-x86_64-51' Target os: 'Android_ANY' Target arch: 'x86_64' Compiler: 'GCC' @@ -35,7 +35,7 @@ Configurations: ] - Id: "automotive-android-10-x86_64-on-linux" - Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Template: 'qtci-linux-RHEL-8.10-x86_64-51' Target os: 'Android_ANY' Target arch: 'x86_64' Compiler: 'GCC'