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/04/01 21:18:50 UTC
[maven] branch update-maven-verifier updated: ensure output is
cleaned in case checkout tests fails
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch update-maven-verifier
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/update-maven-verifier by this push:
new 5e86cec ensure output is cleaned in case checkout tests fails
5e86cec is described below
commit 5e86cec0afdf6be39b9f3e2e0cbca7b85e7aad3d
Author: rfscholte <rf...@apache.org>
AuthorDate: Wed Apr 1 23:18:38 2020 +0200
ensure output is cleaned in case checkout tests fails
---
Jenkinsfile | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 313fbb8..08335e1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -89,15 +89,16 @@ for (String os in runITsOses) {
// will not trample each other plus workaround for JENKINS-52657
dir(isUnix() ? 'test' : "c:\\mvn-it-${EXECUTOR_NUMBER}.tmp") {
def WORK_DIR=pwd()
- checkout tests
- if (isUnix()) {
- sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $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"
- }
- unstash 'dist'
try {
+ checkout tests
+ if (isUnix()) {
+ sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $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"
+ }
+ unstash 'dist'
+
withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[
junitPublisher(ignoreAttachments: false)
]) {