Use weston on Wayland for RHEL10

Signed-off-by: Lan Xia <[email protected]>
adoptium · Jan 18, 2025 · 371c6be · 371c6be
1 parent 31b35bb
commit 371c6be
Showing 1 changed file with 17 additions and 7 deletions.
diff --git a/buildenv/jenkins/JenkinsfileBase b/buildenv/jenkins/JenkinsfileBase
@@ -767,15 +767,25 @@ def runTest( ) {
 		for (int i = 1; i <= ITERATIONS; i++) {
 			echo "ITERATION: ${i}/${ITERATIONS}"
 			if (env.SPEC.contains('linux') && !(LABEL.contains('ci.agent.dynamic') && CLOUD_PROVIDER == 'azure') && (BUILD_LIST != "external")) {
-				// Add an additional 10 second timeout due to issue: https://github.com/adoptium/temurin-build/issues/2368#issuecomment-756683888
-				wrap([$class: 'Xvfb', autoDisplayName: true, timeout:20]) {
-					def DISPLAY = sh (
-							script: 'ps -f | grep \'[X]vfb\' | awk \'{print \$9}\'',
-							returnStdout: true
-					).trim()
-					env.DISPLAY = "${DISPLAY}"
+				// RHEL10 uses Wayland instead of X11
+				// TODO: once proper label is added on the machine, NODE_NAME check should be removed.
+				if (LABEL.contains("sw.os.rhel.10") || "${NODE_NAME}".toLowerCase().contains("rhel10")) {
+					sh "weston --no-config --socket=wayland-vfb --backend=headless-backend.so --xwayland &"
+					env.DISPLAY = ":0"
+
 					echo "env.DISPLAY is ${env.DISPLAY}"
 					makeTest("${RUNTEST_CMD}")
+				} else {
+					// Add an additional 10 second timeout due to issue: https://github.com/adoptium/temurin-build/issues/2368#issuecomment-756683888
+					wrap([$class: 'Xvfb', autoDisplayName: true, timeout:20]) {
+						def DISPLAY = sh (
+								script: 'ps -f | grep \'[X]vfb\' | awk \'{print \$9}\'',
+								returnStdout: true
+						).trim()
+						env.DISPLAY = "${DISPLAY}"
+						echo "env.DISPLAY is ${env.DISPLAY}"
+						makeTest("${RUNTEST_CMD}")
+					}
 				}
 			} else if (BUILD_LIST.contains('external')) {
 				sshagent (credentials: ["$params.SSH_AGENT_CREDENTIAL"], ignoreMissing: true) {