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


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

Branch: refs/heads/master
Commit: ea34d6a683a7516af4f820f1bcf01ba3da77b4c6
Parents: 0399d7d
Author: Tibor17 <[email protected]>
Authored: Tue Aug 22 09:31:29 2017 +0200
Committer: Tibor17 <[email protected]>
Committed: Tue Aug 22 09:31:29 2017 +0200

----------------------------------------------------------------------
 Jenkinsfile | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


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

Reply via email to