Skip to content

Commit

Permalink
Update JenkinsfileBase
Browse files Browse the repository at this point in the history
  • Loading branch information
gdams authored Jul 22, 2021
1 parent bc5a924 commit 4240e6f
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion buildenv/jenkins/JenkinsfileBase
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,13 @@ def runTest( ) {
echo "env.DISPLAY is ${env.DISPLAY}"
makeTest("${RUNTEST_CMD}")
}
else if ((env.SPEC.startsWith('linux') && !(LABEL.contains('ci.agent.dynamic') && CLOUD_PROVIDER == 'azure')) || env.SPEC.startsWith('sunos')) {
else if (env.SPEC.startsWith('sunos')) {
sh "nohup /usr/X11/bin/Xvfb :2 -screen 0 1024x768x24 &"
env.DISPLAY = ":2"
echo "env.DISPLAY is ${env.DISPLAY}"
makeTest("${RUNTEST_CMD}")
}
else if (env.SPEC.startsWith('linux') && !(LABEL.contains('ci.agent.dynamic') && CLOUD_PROVIDER == 'azure')) {
// 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:10]) {
def DISPLAY = sh (
Expand Down

0 comments on commit 4240e6f

Please sign in to comment.