@@ -767,15 +767,25 @@ def runTest( ) {
767
767
for (int i = 1 ; i <= ITERATIONS ; i++ ) {
768
768
echo " ITERATION: ${ i} /${ ITERATIONS} "
769
769
if (env. SPEC . contains(' linux' ) && ! (LABEL . contains(' ci.agent.dynamic' ) && CLOUD_PROVIDER == ' azure' ) && (BUILD_LIST != " external" )) {
770
- // Add an additional 10 second timeout due to issue: https://github.com/adoptium/temurin-build/issues/2368#issuecomment-756683888
771
- wrap([$class : ' Xvfb' , autoDisplayName : true , timeout :20 ]) {
772
- def DISPLAY = sh (
773
- script : ' ps -f | grep \' [X]vfb\' | awk \' {print \$ 9}\' ' ,
774
- returnStdout : true
775
- ). trim()
776
- env. DISPLAY = " ${ DISPLAY} "
770
+ // RHEL10 uses Wayland instead of X11
771
+ // TODO: once proper label is added on the machine, NODE_NAME check should be removed.
772
+ if (LABEL . contains(" sw.os.rhel.10" ) || " ${ NODE_NAME} " . toLowerCase(). contains(" rhel10" )) {
773
+ sh " weston --no-config --socket=wayland-vfb --backend=headless-backend.so --xwayland &"
774
+ env. DISPLAY = " :0"
775
+
777
776
echo " env.DISPLAY is ${ env.DISPLAY} "
778
777
makeTest(" ${ RUNTEST_CMD} " )
778
+ } else {
779
+ // Add an additional 10 second timeout due to issue: https://github.com/adoptium/temurin-build/issues/2368#issuecomment-756683888
780
+ wrap([$class : ' Xvfb' , autoDisplayName : true , timeout :20 ]) {
781
+ def DISPLAY = sh (
782
+ script : ' ps -f | grep \' [X]vfb\' | awk \' {print \$ 9}\' ' ,
783
+ returnStdout : true
784
+ ). trim()
785
+ env. DISPLAY = " ${ DISPLAY} "
786
+ echo " env.DISPLAY is ${ env.DISPLAY} "
787
+ makeTest(" ${ RUNTEST_CMD} " )
788
+ }
779
789
}
780
790
} else if (BUILD_LIST . contains(' external' )) {
781
791
sshagent (credentials : [" $params . SSH_AGENT_CREDENTIAL " ], ignoreMissing : true ) {
0 commit comments