Repository: maven-surefire
Updated Branches:
  refs/heads/jenkinsfile e7a2e4b3b -> 952690585


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

Branch: refs/heads/jenkinsfile
Commit: 9526905858484b1d4984250666864c7a39aa70b8
Parents: e7a2e4b
Author: Tibor17 <[email protected]>
Authored: Wed Aug 23 11:33:01 2017 +0200
Committer: Tibor17 <[email protected]>
Committed: Wed Aug 23 11:33:01 2017 +0200

----------------------------------------------------------------------
 Jenkinsfile | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/95269058/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index fc3e8f3..fac148d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,27 +6,21 @@ pipeline {
                 parallel unix: {
                     node("${env.NIX_LABEL}") {
                         checkout scm
-                        try {
-                            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')}\\\""
-                            }
-                        } finally {
-                            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'
+                        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'
+                        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
-                        try {
-                            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"
-                            }
-                        } finally {
-                            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'
+                        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'
                     }
                 }
             }

Reply via email to