You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2020/05/09 07:50:03 UTC
[maven] branch MNG-5937 updated: [MNG-5937] introduce dists folder
on Jenkins for easy file management
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-5937
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/MNG-5937 by this push:
new 72ad391 [MNG-5937] introduce dists folder on Jenkins for easy file management
72ad391 is described below
commit 72ad391b39b12adb8b1ba708fc5898cf5fcdd028
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat May 9 09:49:51 2020 +0200
[MNG-5937] introduce dists folder on Jenkins for easy file management
---
Jenkinsfile | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 085bfbd..e15280a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -64,10 +64,10 @@ node(jenkinsEnv.nodeSelection(osNode)) {
}
dir ('apache-maven/target') {
sh "mv apache-maven-*-bin.zip apache-maven-dist.zip"
- stash includes: 'apache-maven-dist.zip', name: 'dist'
+ stash includes: 'apache-maven-dist.zip', name: 'maven-dist'
}
dir ('maven-wrapper/target') {
- stash includes: 'apache-maven-wrapper-*.zip,maven-wrapper.jar', name: 'wrappers'
+ stash includes: 'apache-maven-wrapper-*.zip,maven-wrapper.jar', name: 'wrapper-dist'
}
}
@@ -96,18 +96,20 @@ for (String os in runITsOses) {
def WORK_DIR=pwd()
checkout tests
if (isUnix()) {
- sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo"
+ sh "rm -rvf $WORK_DIR/dists $WORK_DIR/it-local-repo"
} else {
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"
+ bat "if exist dists rmdir /s /q dists"
+ }
+ dir('dists') {
+ unstash 'maven-dist'
+ unstash 'wrapper-dist'
}
- unstash 'dist'
- unstash 'wrappers'
try {
withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[
junitPublisher(ignoreAttachments: false)
]) {
- String cmd = "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip -Dmaven.test.failure.ignore=true -DmavenWrapper=$WORK_DIR/maven-wrapper.jar -DwrapperDistroDir=${WORK_DIR}"
+ String cmd = "${runITscommand} -DmavenDistro=$WORK_DIR/dists/apache-maven-dist.zip -Dmaven.test.failure.ignore=true -DmavenWrapper=$WORK_DIR/dists/maven-wrapper.jar -DwrapperDistroDir=${WORK_DIR}/dists"
if (isUnix()) {
sh 'df -hT'