Repository: maven-surefire
Updated Branches:
  refs/heads/jenkinsfile b9924cd4e -> 31003a638


Jenkinsfile


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

Branch: refs/heads/jenkinsfile
Commit: 31003a638299cdaa923a31160e568afa02d53477
Parents: b9924cd
Author: Tibor17 <[email protected]>
Authored: Tue Aug 22 15:53:25 2017 +0200
Committer: Tibor17 <[email protected]>
Committed: Tue Aug 22 15:53:25 2017 +0200

----------------------------------------------------------------------
 Jenkinsfile | 42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/31003a63/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 11b0716..838259a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,36 +1,32 @@
 pipeline {
     agent none
     stages {
-        stage('Platforms') {
+        stage('Parallel Unix and Windows Build') {
             steps {
                 parallel unix: {
-                    stage('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'
-                            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'
-                                }
+                    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'
+                        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'
                             }
                         }
                     }
                 },
                 windows: {
-                    stage('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'
-                            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'
-                                }
+                    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'
+                        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'
                             }
                         }
                     }

Reply via email to