You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by sk...@apache.org on 2019/10/17 12:25:37 UTC

[netbeans-jenkins-lib] branch master updated: try to have 2 stages in case of xvfb

This is an automated email from the ASF dual-hosted git repository.

skygo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-jenkins-lib.git


The following commit(s) were added to refs/heads/master by this push:
     new f68dc02  try to have 2 stages in case of xvfb
f68dc02 is described below

commit f68dc02c0db3c4772a50e24b26b1bf0c9e836a56
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Thu Oct 17 14:25:28 2019 +0200

    try to have 2 stages in case of xvfb
---
 vars/asfStandardBuild.groovy | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/vars/asfStandardBuild.groovy b/vars/asfStandardBuild.groovy
index 378d17a..eaf39e3 100644
--- a/vars/asfStandardBuild.groovy
+++ b/vars/asfStandardBuild.groovy
@@ -46,20 +46,32 @@ def call(Map params = [:]) {
     pipeline {
         agent any
 	triggers {
-	   pollSCM('H/5 * * * * ')
+            pollSCM('H/5 * * * * ')
 	}
         stages{
-            stage("Build"){
+            stage("Build with xvfb") {
                 agent { node { label 'ubuntu' } }
                 options { timeout(time: 120, unit: 'MINUTES') }
+                when {expression {
+                        return xvfb
+                    }
+                }
+                steps{
+                    wrap([$class: 'Xvfb', additionalOptions: '', assignedLabels: '', displayNameOffset: 0, installationName: 'Xvfb', parallelBuild: true, screen: '']) {
+                        mavenBuild( jdk, cmdline, mvnName, publishers)
+                    }
+                }
+            }
+            stage("Build") {
+                agent { node { label 'ubuntu' } }
+                options { timeout(time: 120, unit: 'MINUTES') }
+                when {expression {
+                        return !xvfb
+                    }
+                }
                 steps{
-		    if (xvbf) {
-			wrap([$class: 'Xvfb', additionalOptions: '', assignedLabels: '', displayNameOffset: 0, installationName: 'Xvfb', parallelBuild: true, screen: '']) {
-			    mavenBuild( jdk, cmdline, mvnName, publishers)
-			}
-		    } else {
-	                 mavenBuild( jdk, cmdline, mvnName, publishers)
-		    }
+                    mavenBuild( jdk, cmdline, mvnName, publishers)
+                    
                 }
             }
         }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists