Repository: maven-surefire
Updated Branches:
  refs/heads/master 200d28687 -> 0399d7dd8


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/0399d7dd
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/0399d7dd
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/0399d7dd

Branch: refs/heads/master
Commit: 0399d7dd8bc2583ecc642ce5baa81992157cb23a
Parents: 200d286
Author: Tibor17 <[email protected]>
Authored: Tue Aug 22 09:10:05 2017 +0200
Committer: Tibor17 <[email protected]>
Committed: Tue Aug 22 09:10:05 2017 +0200

----------------------------------------------------------------------
 Jenkinsfile | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/0399d7dd/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index fa97b83..15d4592 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,40 +6,35 @@ pipeline {
                 parallel(
                     'Unix Build': {
                         node("${env.NIX_LABEL}") {
-                            steps {
+                            stage('Unix') {
                                 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 Build': {
                         node("${env.WIN_LABEL}") {
-                            steps {
+                            stage('Windows') {
                                 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'
-                                }
-                            }
                         }
                     }
                 )
             }
         }
     }
+    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