Provisioning: Disable keyring password prompt

Fixes: QTQAINFRA-6215 Pick-to: 6.5 Change-Id: I50e70177f763493107d0919625f4885dc3a9713d Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io> Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit 1716158656) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 1f69b89aff)
Provisioning: Add vulkan package to SLES 15 SP5 for RTA usage
2026-01-21 06:16:03 +08:00 · 2024-03-27 20:36:02 +00:00 · 2024-03-22 15:58:59 +00:00 · 2024-03-19 08:48:44 +01:00
5 changed files with 39 additions and 4 deletions
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -180,16 +180,27 @@ Configurations:
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
    ]
+# Build on Debian-11.6 and split test on Wayland and offscreen later
 -
    Id: 'debian-11.6-arm64'
    Template: 'qtci-linux-Debian-11.6-aarch64-50'
    Compiler: 'GCC'
-    Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'InsignificantTests']
+    Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests']
    Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -no-libudev -bundled-xcb-xinput'
    Environment variables: [
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY'
    ]
-
+# 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_PLATFORM=offscreen'
+    ]
+    Platform dependency: 'debian-11.6-arm64'
 -
    Id: 'ios-universal'
    Template: 'qtci-macos-13-x86_64-103'
--- a/coin/platform_configs/qt5.yaml
+++ b/coin/platform_configs/qt5.yaml
@@ -2,4 +2,14 @@ Version: 2
 Include: [
    cmake_platforms.yaml
 ]
-Configurations: []
+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'
--- a/coin/platform_configs/qtwayland.yaml
+++ b/coin/platform_configs/qtwayland.yaml
@@ -16,3 +16,13 @@ Configurations:
    Compiler: 'GCC'
    Features: ['Sccache', 'TestOnly', 'RunDependencyTests', 'InsignificantTests']
    Platform dependency: 'ubuntu-22.04'
+# 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'
--- a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh
@@ -247,6 +247,9 @@ waitLoop
 sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}"
 sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install cmake apt-cacher-ng -t bullseye-backports

+# Disable keyring password prompt
+keyring --disable
+
 # SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH"

 #OpenSSLVersion="$(openssl version |cut -b 9-14)"
--- a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh
@@ -57,7 +57,8 @@ sudo zypper -nq install --force-resolution libxcb-cursor0 xcb-util-cursor-devel
 # qtwebengine
 sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel libdrm-devel \
         libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \
-         mozilla-nspr-devel mozilla-nss-devel glproto-devel libxshmfence-devel
+         mozilla-nspr-devel mozilla-nss-devel glproto-devel libxshmfence-devel \
+         vulkan-devel

 # qtwebkit
 sudo zypper -nq install libxml2-devel libxslt-devel