Repository: maven-surefire Updated Branches: refs/heads/master a93857e2d -> 200d28687
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/200d2868 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/200d2868 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/200d2868 Branch: refs/heads/master Commit: 200d286870b27063f700a1049ef1016cde8a490e Parents: a93857e Author: Tibor17 <[email protected]> Authored: Tue Aug 22 09:00:22 2017 +0200 Committer: Tibor17 <[email protected]> Committed: Tue Aug 22 09:00:22 2017 +0200 ---------------------------------------------------------------------- Jenkinsfile | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/200d2868/Jenkinsfile ---------------------------------------------------------------------- diff --git a/Jenkinsfile b/Jenkinsfile index 22f053c..fa97b83 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,13 +6,11 @@ pipeline { parallel( 'Unix Build': { node("${env.NIX_LABEL}") { - tools { - maven 'Maven 3.5.0' - jdk 'JDK 1.8.0_144' - } steps { checkout scm - 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')}\\\"" + 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 { @@ -24,13 +22,11 @@ pipeline { }, 'Windows Build': { node("${env.WIN_LABEL}") { - tools { - maven 'Maven 3.5.0 (Windows)' - jdk 'JDK 1.8_121 (Windows Only)' - } steps { checkout scm - 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" + 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 {
