Repository: maven-surefire
Updated Branches:
  refs/heads/master ea34d6a68 -> 0330f7bc9


Jenkinsfile Working


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/0330f7bc
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/0330f7bc
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/0330f7bc

Branch: refs/heads/master
Commit: 0330f7bc9692498e207bafc0f306cf34d43b6883
Parents: ea34d6a
Author: Tibor17 <[email protected]>
Authored: Wed Aug 23 13:41:26 2017 +0200
Committer: Tibor17 <[email protected]>
Committed: Wed Aug 23 13:41:26 2017 +0200

----------------------------------------------------------------------
 Jenkinsfile | 41 ++++++++++++++++++-----------------------
 1 file changed, 18 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/0330f7bc/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 3740ec1..fac148d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,36 +1,31 @@
 pipeline {
     agent none
     stages {
-        stage('Platforms') {
+        stage('Parallel Unix and Windows Build') {
             steps {
-                parallel(
-                    'Unix Build': {
-                        node("${env.NIX_LABEL}") {
-                            checkout scm
-                            withEnv(["JAVA_HOME=${tool('JDK 1.8.0_144')}", 
"PATH+MAVEN=${tool('Maven 3.5.0')}/bin:${env.JAVA_HOME}/bin"]) {
-                                sh "mvn clean install jacoco:report -B -U -e 
-fae -V -P run-its,jenkins -Dsurefire.useFile=false -Dfailsafe.useFile=false 
-Dintegration-test-port=8084   \\\"-Djdk.home=${tool('JDK 9 b181')}\\\""
-                            }
-                            jacoco changeBuildStatus: false, execPattern: 
'**/*.exec'
+                parallel unix: {
+                    node("${env.NIX_LABEL}") {
+                        checkout scm
+                        withEnv(["JAVA_HOME=${tool('JDK 1.8.0_144')}", 
"PATH+MAVEN=${tool('Maven 3.5.0')}/bin:${env.JAVA_HOME}/bin"]) {
+                            sh "mvn clean install jacoco:report -B -U -e -fae 
-V -P run-its,jenkins -Dsurefire.useFile=false -Dfailsafe.useFile=false 
-Dintegration-test-port=8084   \\\"-Djdk.home=${tool('JDK 9 b181')}\\\""
                         }
-                    },
-                    'Windows Build': {
-                        node("${env.WIN_LABEL}") {
-                            checkout scm
-                            withEnv(["JAVA_HOME=${tool('JDK 1.8_121 (Windows 
Only)')}", "PATH+MAVEN=${tool('Maven 3.5.0 
(Windows)')}\\bin;${env.JAVA_HOME}\\bin"]) {
-                                bat "mvn clean install jacoco:report -B -U -e 
-fae -V -P run-its,jenkins -Dsurefire.useFile=false -Dfailsafe.useFile=false 
-Dintegration-test-port=8084"
-                            }
-                            jacoco changeBuildStatus: false, execPattern: 
'**/*.exec'
+                        jacoco changeBuildStatus: false, execPattern: 
'**/*.exec'
+                        junit healthScaleFactor: 0.0, allowEmptyResults: true, 
keepLongStdio: true, testResults: 
'**/surefire-integration-tests/target/failsafe-reports/**/*.xml,**/surefire-integration-tests/target/surefire-reports/**/*.xml,**/maven-*/target/surefire-reports/**/*.xml,**/surefire-*/target/surefire-reports/**/*.xml,**/common-*/target/surefire-reports/**/*.xml'
+                    }
+                },
+                windows: {
+                    node("${env.WIN_LABEL}") {
+                        checkout scm
+                        withEnv(["JAVA_HOME=${tool('JDK 1.8_121 (Windows 
Only)')}", "PATH+MAVEN=${tool('Maven 3.5.0 
(Windows)')}\\bin;${env.JAVA_HOME}\\bin"]) {
+                            bat "mvn clean install jacoco:report -B -U -e -fae 
-V -P run-its,jenkins -Dsurefire.useFile=false -Dfailsafe.useFile=false 
-Dintegration-test-port=8084"
                         }
+                        jacoco changeBuildStatus: false, execPattern: 
'**/*.exec'
+                        junit healthScaleFactor: 0.0, allowEmptyResults: true, 
keepLongStdio: true, testResults: 
'**/surefire-integration-tests/target/failsafe-reports/**/*.xml,**/surefire-integration-tests/target/surefire-reports/**/*.xml,**/maven-*/target/surefire-reports/**/*.xml,**/surefire-*/target/surefire-reports/**/*.xml,**/common-*/target/surefire-reports/**/*.xml'
                     }
-                )
+                }
             }
         }
     }
-    post {
-        always {
-            junit healthScaleFactor: 0.0, allowEmptyResults: true, 
keepLongStdio: true, testResults: 
'**/surefire-integration-tests/target/failsafe-reports/**/*.xml,**/surefire-integration-tests/target/surefire-reports/**/*.xml,**/maven-*/target/surefire-reports/**/*.xml,**/surefire-*/target/surefire-reports/**/*.xml,**/common-*/target/surefire-reports/**/*.xml'
-        }
-    }
     options {
         buildDiscarder(logRotator(numToKeepStr:'3'))
         timeout(time: 10, unit: 'HOURS')

Reply via email to