lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-27 00:41:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix SSH for RHEL-8.10

Browse Source 
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 <assam.boudjelthia@qt.io>
This commit is contained in:
Elias Toivola
2024-10-03 16:57:30 +03:00
parent f747d2dec7
commit 293aeab453
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/platform_configs/cmake_platforms.yaml
View File

@@ -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'

2
coin/platform_configs/cmake_platforms_static_release.yaml
View File

@@ -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'

4
coin/platform_configs/cmake_platforms_target_android.yaml
View File

@@ -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'

2
coin/platform_configs/linux_android_tests_developer.yaml
View File

@@ -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'

2
coin/platform_configs/linux_android_tests_multi_abi.yaml
View File

@@ -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'

2
coin/platform_configs/qt-creator.yaml
View File

@@ -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: ''

2
coin/platform_configs/qtsaferenderer.yaml
View File

@@ -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'

4
coin/platform_configs/tqtc-android-automotive.yaml
View File

@@ -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'