Skip to content

Add in Xvfb vs wayland auto-detection #6541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add in Xvfb vs wayland auto-detection #6541

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions buildenv/jenkins/JenkinsfileBase
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,9 +786,8 @@ 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")) {
// 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")) {
// Detect if Xvfb is on the machine, and if not use the wayland startup code (Initially for EL10)
if ( sh(script:"which Xvfb 2>&1", returnStatus:true) ) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest explicitly checking the return code:
if (sh(script: "which Xvfb 2>&1", returnStatus: true) != 0) {

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My preference would be to leave it as-is for now as it's been fully tested and I want to try and get this live, but I'm happy to change it in in a future PR if you're prefer. Let me know if you're ok with that.

sh "weston --no-config --socket=wayland-vfb --backend=headless-backend.so --xwayland &"
env.DISPLAY = ":0"

Expand Down