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

rombert pushed a commit to branch feature/SLING-7597
in repository https://gitbox.apache.org/repos/asf/sling-ide-tooling.git


The following commit(s) were added to refs/heads/feature/SLING-7597 by this 
push:
     new c29a954  SLING-7597 - Investigate setting up Windows testing
c29a954 is described below

commit c29a9543acd7c087f9c13eeda08b39f3ec5e7b5a
Author: Robert Munteanu <[email protected]>
AuthorDate: Tue Feb 26 22:21:28 2019 +0100

    SLING-7597 - Investigate setting up Windows testing
    
    Run Windows and Linux tests in parallel.
---
 Jenkinsfile | 121 +++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 62 insertions(+), 59 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 5b3d89a..5682479 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,90 +3,93 @@ import org.apache.sling.jenkins.SlingJenkinsHelper;
 def mvnVersion = 'Maven 3.3.9'
 def javaVersion = 'JDK 1.8 (latest)'
 
-node('ubuntu') {
+parallel 'linux' : { 
+    
+        node('ubuntu') {
 
-    def helper = new SlingJenkinsHelper()
-    helper.runWithErrorHandling({ jobConfig ->
+        def helper = new SlingJenkinsHelper()
+        helper.runWithErrorHandling({ jobConfig ->
 
-        stage('Build shared code') {
-            withMaven(maven: mvnVersion, jdk: javaVersion, options: 
[artifactsPublisher(disabled: true)]) {
-                timeout(10) {
-                    sh "mvn -f shared/modules clean install"
+            stage('Build shared code') {
+                withMaven(maven: mvnVersion, jdk: javaVersion, options: 
[artifactsPublisher(disabled: true)]) {
+                    timeout(10) {
+                        sh "mvn -f shared/modules clean install"
+                    }
                 }
             }
-        }
 
-        stage('Build CLI bundles') {
-            withMaven(maven: mvnVersion, jdk: javaVersion, options: 
[artifactsPublisher(disabled: true)]) {
-                timeout(10) {
-                    sh "mvn -f cli clean install"
+            stage('Build CLI bundles') {
+                withMaven(maven: mvnVersion, jdk: javaVersion, options: 
[artifactsPublisher(disabled: true)]) {
+                    timeout(10) {
+                        sh "mvn -f cli clean install"
+                    }
                 }
             }
-        }
 
-        stage ('Build shared code P2 repository') {
-            withMaven(maven: mvnVersion, jdk: javaVersion, options: 
[artifactsPublisher(disabled: true)]) {
-                timeout(10) {
-                    sh 'mvn -f shared/p2 clean package'
+            stage ('Build shared code P2 repository') {
+                withMaven(maven: mvnVersion, jdk: javaVersion, options: 
[artifactsPublisher(disabled: true)]) {
+                    timeout(10) {
+                        sh 'mvn -f shared/p2 clean package'
+                    }
                 }
             }
-        }
 
-        stage ('Build Eclipse plug-ins') {
-            withMaven(maven: mvnVersion, jdk: javaVersion, options: 
[artifactsPublisher(disabled: true)]) {
-                timeout(20) {
-                    wrap([$class: 'Xvfb']) {
-                        sh 'mvn -f eclipse clean verify -Ddebug'
+            stage ('Build Eclipse plug-ins') {
+                withMaven(maven: mvnVersion, jdk: javaVersion, options: 
[artifactsPublisher(disabled: true)]) {
+                    timeout(20) {
+                        wrap([$class: 'Xvfb']) {
+                            sh 'mvn -f eclipse clean verify -Ddebug'
+                        }
+                        // workaround for 
https://issues.jenkins-ci.org/browse/JENKINS-55889
+                        junit 'eclipse/**/surefire-reports/*.xml' 
+                        archiveArtifacts artifacts: 'eclipse/**/logs/*.log'
                     }
-                    // workaround for 
https://issues.jenkins-ci.org/browse/JENKINS-55889
-                    junit 'eclipse/**/surefire-reports/*.xml' 
-                    archiveArtifacts artifacts: 'eclipse/**/logs/*.log'
                 }
             }
-        }
-    });
-}
-
-node('Windows') {
-    def helper = new SlingJenkinsHelper()
-    helper.runWithErrorHandling({ jobConfig ->
+        });
+    }
+}, 
+'windows' : {
+    node('Windows') {
+        def helper = new SlingJenkinsHelper()
+        helper.runWithErrorHandling({ jobConfig ->
 
-        stage('Build shared code') {
-            withMaven(maven: mvnVersion, jdk: javaVersion, options: 
[artifactsPublisher(disabled: true)]) {
-                timeout(10) {
-                   bat  "mvn -f shared/modules clean install"
+            stage('Build shared code') {
+                withMaven(maven: mvnVersion, jdk: javaVersion, options: 
[artifactsPublisher(disabled: true)]) {
+                    timeout(10) {
+                    bat  "mvn -f shared/modules clean install"
+                    }
                 }
             }
-        }
 
-        stage('Build CLI bundles') {
-            withMaven(maven: mvnVersion, jdk: javaVersion, options: 
[artifactsPublisher(disabled: true)]) {
-                timeout(10) {
-                    bat "mvn -f cli clean install"
+            stage('Build CLI bundles') {
+                withMaven(maven: mvnVersion, jdk: javaVersion, options: 
[artifactsPublisher(disabled: true)]) {
+                    timeout(10) {
+                        bat "mvn -f cli clean install"
+                    }
                 }
             }
-        }
 
-        stage ('Build shared code P2 repository') {
-            withMaven(maven: mvnVersion, jdk: javaVersion, options: 
[artifactsPublisher(disabled: true)]) {
-                timeout(10) {
-                    bat 'mvn -f shared/p2 clean package'
+            stage ('Build shared code P2 repository') {
+                withMaven(maven: mvnVersion, jdk: javaVersion, options: 
[artifactsPublisher(disabled: true)]) {
+                    timeout(10) {
+                        bat 'mvn -f shared/p2 clean package'
+                    }
                 }
             }
-        }
 
-        stage ('Build Eclipse plug-ins') {
-            withMaven(maven: mvnVersion, jdk: javaVersion, options: 
[artifactsPublisher(disabled: true)]) {
-                timeout(20) {
-                    wrap([$class: 'Xvfb']) {
-                        bat 'mvn -f eclipse clean verify -Ddebug'
+            stage ('Build Eclipse plug-ins') {
+                withMaven(maven: mvnVersion, jdk: javaVersion, options: 
[artifactsPublisher(disabled: true)]) {
+                    timeout(20) {
+                        wrap([$class: 'Xvfb']) {
+                            bat 'mvn -f eclipse clean verify -Ddebug'
+                        }
+                        // workaround for 
https://issues.jenkins-ci.org/browse/JENKINS-55889
+                        junit 'eclipse/**/surefire-reports/*.xml' 
+                        archiveArtifacts artifacts: 'eclipse/**/logs/*.log'
                     }
-                    // workaround for 
https://issues.jenkins-ci.org/browse/JENKINS-55889
-                    junit 'eclipse/**/surefire-reports/*.xml' 
-                    archiveArtifacts artifacts: 'eclipse/**/logs/*.log'
                 }
             }
-        }
-    });
-
+        });
+    }
 }

Reply via email to