Repository: maven
Updated Branches:
  refs/heads/master 7c02b2014 -> 351fd9e75


now we're suckin diesel


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

Branch: refs/heads/master
Commit: 351fd9e75b7acf0641b513ef2a390fc3206bf43a
Parents: 7c02b20
Author: Stephen Connolly <stephen.alan.conno...@gmail.com>
Authored: Tue Jan 3 15:05:33 2017 +0000
Committer: Stephen Connolly <stephen.alan.conno...@gmail.com>
Committed: Tue Jan 3 15:05:33 2017 +0000

----------------------------------------------------------------------
 Jenkinsfile | 40 +++++++++++++++++++++++++++++++---------
 1 file changed, 31 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/351fd9e7/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 84fcfac..164626d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -23,7 +23,9 @@ try {
 node('ubuntu') {
     stage 'Checkout'
     def MAVEN_BUILD=tool name: 'Maven 3.3.9', type: 
'hudson.tasks.Maven$MavenInstallation'
+    echo "Driving build and unit tests using Maven $MAVEN_BUILD"
     def JAVA7_HOME=tool name: 'JDK 1.7 (latest)', type: 'hudson.model.JDK'
+    echo "Running build and unit tests with Java $JAVA7_HOME"
     dir('build') {
         checkout scm
         def WORK_DIR=pwd()
@@ -42,7 +44,9 @@ stage 'Integration Test'
 parallel linuxJava7:{
         node('ubuntu') {
             def MAVEN_NIX_J7=tool name: 'Maven 3.3.9', type: 
'hudson.tasks.Maven$MavenInstallation'
+            echo "Driving integration tests using Maven $MAVEN_NIX_J7"
             def JAVA_NIX_J7=tool name: 'JDK 1.7 (latest)', type: 
'hudson.model.JDK'
+            echo "Running integration tests with Java $JAVA_NIX_J7"
             dir('test') {
                 def WORK_DIR=pwd()
                 
git(url:'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git',
 branch: 'master')
@@ -50,14 +54,16 @@ parallel linuxJava7:{
                 unstash 'dist'
                 
withEnv(["PATH+MAVEN=$MAVEN_NIX_J7/bin","PATH+JDK=$JAVA_NIX_J7/bin"]) {
                     sh "mvn clean verify  -Prun-its -B -U -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo 
-DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
-                    junit allowEmptyResults: true, 
testResults:'**/target/*-reports/*.xml'
                 }
+                junit allowEmptyResults: true, 
testResults:'**/target/*-reports/*.xml'
             }
         }
     },linuxJava8: {
         node('ubuntu') {
             def MAVEN_NIX_J8=tool name: 'Maven 3.3.9', type: 
'hudson.tasks.Maven$MavenInstallation'
+            echo "Driving integration tests using Maven $MAVEN_NIX_J8"
             def JAVA_NIX_J8=tool name: 'JDK 1.8 (latest)', type: 
'hudson.model.JDK'
+            echo "Running integration tests with Java $JAVA_NIX_J8"
             dir('test') {
                 def WORK_DIR=pwd()
                 
git(url:'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git',
 branch: 'master')
@@ -65,42 +71,58 @@ parallel linuxJava7:{
                 unstash 'dist'
                 
withEnv(["PATH+MAVEN=$MAVEN_NIX_J8/bin","PATH+JDK=$JAVA_NIX_J8/bin"]) {
                     sh "mvn clean verify  -Prun-its -B -U -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo 
-DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
-                    junit allowEmptyResults: true, 
testResults:'**/target/*-reports/*.xml'
                 }
+                junit allowEmptyResults: true, 
testResults:'**/target/*-reports/*.xml'
             }
         }
     }, winJava7: {
         node('Windows') {
-            def MAVEN_WIN_J7=tool name: 'Maven 3.3.9 (Windows))', type: 
'hudson.tasks.Maven$MavenInstallation'
+            def MAVEN_WIN_J7=tool name: 'Maven 3.3.9 (Windows)', type: 
'hudson.tasks.Maven$MavenInstallation'
+            dir(MAVEN_WIN_J7) {
+                MAVEN_WIN_J7=pwd()
+            }
+            echo "Driving integration tests using Maven $MAVEN_WIN_J7"
             def JAVA_WIN_J7=tool name: 'JDK 1.7 (unlimited security) 64-bit 
Windows only', type: 'hudson.model.JDK'
+            dir(JAVA_WIN_J7) {
+                JAVA_WIN_J7=pwd()
+            }
+            echo "Running integration tests with Java $JAVA_WIN_J7"
             dir('test') {
                 def WORK_DIR=pwd()
                 
git(url:'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git',
 branch: 'master')
                 bat "if exist it-local-repo rmdir /s /q it-local-repo"
                 bat "if exist apache-maven-dist.zip del /q 
apache-maven-dist.zip"
-                unstash 'dist'
-                
withEnv(['Path+MAVEN='+MAVEN_WIN_J7.replace('\\\\','\\')+'\\bin','Path+JDK'+JAVA_WIN_J7.replace('\\\\','\\')+'\\bin'])
 {
+                
withEnv(["Path+MAVEN=$MAVEN_WIN_J7\\bin","Path+JDK=$JAVA_WIN_J7\\bin","JAVA_HOME=$JAVA_WIN_J7"])
 {
                     bat "set"
+                    unstash 'dist'
                     bat "mvn clean verify  -Prun-its -B -U -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo 
-DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
-                    junit allowEmptyResults: true, 
testResults:'**/target/*-reports/*.xml'
                 }
+                junit allowEmptyResults: true, 
testResults:'**/target/*-reports/*.xml'
             }
         }
     }, winJava8: {
         node('Windows') {
             def MAVEN_WIN_J8=tool name: 'Maven 3.3.9 (Windows)', type: 
'hudson.tasks.Maven$MavenInstallation'
+            dir(MAVEN_WIN_J8) {
+                MAVEN_WIN_J8=pwd()
+            }
+            echo "Driving integration tests using Maven $MAVEN_WIN_J8"
             def JAVA_WIN_J8=tool name: 'JDK 1.8 (unlimited security) 64-bit 
Windows only', type: 'hudson.model.JDK'
+            dir(JAVA_WIN_J8) {
+                JAVA_WIN_J8=pwd()
+            }
+            echo "Running integration tests with Java $JAVA_WIN_J8"
             dir('test') {
                 def WORK_DIR=pwd()
                 
git(url:'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git',
 branch: 'master')
                 bat "if exist it-local-repo rmdir /s /q it-local-repo"
                 bat "if exist apache-maven-dist.zip del /q 
apache-maven-dist.zip"
-                unstash 'dist'
-                
withEnv(['Path+MAVEN='+MAVEN_WIN_J8.replace('\\\\','\\')+'\\bin','Path+JDK'+JAVA_WIN_J8.replace('\\\\','\\')+'\\bin'])
 {
+                
withEnv(["Path+MAVEN=$MAVEN_WIN_J8\\bin","Path+JDK=$JAVA_WIN_J8\\bin","JAVA_HOME=$JAVA_WIN_J8"])
 {
                     bat "set"
+                    unstash 'dist'
                     bat "mvn clean verify  -Prun-its -B -U -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo 
-DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
-                    junit allowEmptyResults: true, 
testResults:'**/target/*-reports/*.xml'
                 }
+                junit allowEmptyResults: true, 
testResults:'**/target/*-reports/*.xml'
             }
         }
     }

Reply via email to