From 4240e6fb9430017117ad9e41296c91af8bc8a247 Mon Sep 17 00:00:00 2001 From: George Adams Date: Thu, 22 Jul 2021 14:48:10 +0100 Subject: [PATCH] Update JenkinsfileBase --- buildenv/jenkins/JenkinsfileBase | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/buildenv/jenkins/JenkinsfileBase b/buildenv/jenkins/JenkinsfileBase index e74c86d0f1..315391c082 100644 --- a/buildenv/jenkins/JenkinsfileBase +++ b/buildenv/jenkins/JenkinsfileBase @@ -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 (