Repository: maven
Updated Branches:
  refs/heads/master e0e26e0c6 -> a6d43d84a


Seems that the git checkout is failing on windows


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

Branch: refs/heads/master
Commit: a6d43d84a63ace38a51783da3a00b9c0090113a5
Parents: e0e26e0
Author: Stephen Connolly <[email protected]>
Authored: Mon Jan 2 20:19:09 2017 +0000
Committer: Stephen Connolly <[email protected]>
Committed: Mon Jan 2 20:19:09 2017 +0000

----------------------------------------------------------------------
 Jenkinsfile | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/a6d43d84/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 9abc3af..9e4410c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -36,6 +36,10 @@ node('ubuntu') {
             stash includes: 'apache-maven-dist.zip', name: 'dist'
         }
     }
+    dir('test') {
+        
git(url:'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git',
 branch: 'master')
+        stash includes: '**', excludes: '.git/**', name: 'test'        
+    }
 }
 
 stage 'Integration Test'
@@ -45,7 +49,7 @@ parallel linuxJava7:{
             def JAVA_NIX_J7=tool name: 'JDK 1.7 (latest)', type: 
'hudson.model.JDK'
             dir('test') {
                 def WORK_DIR=pwd()
-                
git(url:'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git',
 branch: 'master')
+                unstash 'test'
                 sh "rm -rvf $WORK_DIR/apache-maven-dist.zip 
$WORK_DIR/it-local-repo"
                 unstash 'dist'
                 
withEnv(["PATH+MAVEN=$MAVEN_NIX_J7/bin","PATH+JDK=$JAVA_NIX_J7/bin"]) {
@@ -60,7 +64,7 @@ parallel linuxJava7:{
             def JAVA_NIX_J8=tool name: 'JDK 1.8 (latest)', type: 
'hudson.model.JDK'
             dir('test') {
                 def WORK_DIR=pwd()
-                
git(url:'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git',
 branch: 'master')
+                unstash 'test'
                 sh "rm -rvf $WORK_DIR/apache-maven-dist.zip 
$WORK_DIR/it-local-repo"
                 unstash 'dist'
                 
withEnv(["PATH+MAVEN=$MAVEN_NIX_J8/bin","PATH+JDK=$JAVA_NIX_J8/bin"]) {
@@ -75,14 +79,14 @@ parallel linuxJava7:{
             def JAVA_WIN_J7=tool name: 'JDK 1.8 (latest)', type: 
'hudson.model.JDK'
             dir('test') {
                 def WORK_DIR=pwd()
-                
git(url:'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git',
 branch: 'master')
-                //batch "rmdir /s /q it-local-repo"
-                //batch "del /q apache-maven-dist.zip"
-                //unstash 'dist'
-                
//withEnv(["PATH+MAVEN=$MAVEN_WIN_J7/bin","PATH+JDK=$JAVA_WIN_J7/bin"]) {
-                //    batch "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'
-                //}
+                unstash 'test'
+                batch "rmdir /s /q it-local-repo"
+                batch "del /q apache-maven-dist.zip"
+                unstash 'dist'
+                
withEnv(["PATH+MAVEN=$MAVEN_WIN_J7/bin","PATH+JDK=$JAVA_WIN_J7/bin"]) {
+                    batch "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'
+                }
             }
         }
     }, winJava8: {
@@ -91,14 +95,14 @@ parallel linuxJava7:{
             def JAVA_WIN_J8=tool name: 'JDK 1.8 (latest)', type: 
'hudson.model.JDK'
             dir('test') {
                 def WORK_DIR=pwd()
-                
git(url:'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git',
 branch: 'master')
-                //batch "rmdir /s /q it-local-repo"
-                //batch "del /q apache-maven-dist.zip"
-                //unstash 'dist'
-                
//withEnv(["PATH+MAVEN=$MAVEN_WIN_J8/bin","PATH+JDK=$JAVA_WIN_J8/bin"]) {
-                //    batch "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'
-                //}
+                unstash 'test'
+                batch "rmdir /s /q it-local-repo"
+                batch "del /q apache-maven-dist.zip"
+                unstash 'dist'
+                
withEnv(["PATH+MAVEN=$MAVEN_WIN_J8/bin","PATH+JDK=$JAVA_WIN_J8/bin"]) {
+                    batch "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'
+                }
             }
         }
     }

Reply via email to