-
-
Notifications
You must be signed in to change notification settings - Fork 330
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.
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
base: master
Are you sure you want to change the base?
Conversation
Signed-off-by: Stewart X Addison <[email protected]>
Both of these run through correctly running jdk_beans_0 which uses the display using this PR branch and without using UBI10 (Wayland)https://ci.adoptium.net/job/Grinder/14201/console:
Noting that there was one test which failed in 1/10 iterations in that run: https://ci.adoptium.net/job/Grinder/14202/testReport/java_beans_XMLEncoder_Test4822050/java/Test4822050/ although the stderr output reported UBI9 (X11)https://ci.adoptium.net/job/Grinder/14202/console:
|
@smlambert if you're ok with this it would be good to have your approval today since I believe Canada is not around on Monday and we're very close to being able to make UBI10 containers live in jenkins. |
// 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) ) { |
There was a problem hiding this comment.
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) {
There was a problem hiding this comment.
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.
Implementing the solution I described in #5883 (comment) which avoids the need for labels.
Fixes adoptium/infrastructure#3851