[maven-jenkins-lib] branch master updated: INFRA-16749, INFRA-16768 - Followup cleanup under all circumstances. Wrong location for cleanup.

[kh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

khmarbaise pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jenkins-lib.git


The following commit(s) were added to refs/heads/master by this push:
     new daa65c2  INFRA-16749, INFRA-16768  - Followup cleanup under all circumstances.    Wrong location for cleanup.
daa65c2 is described below

commit daa65c2cc00651e7fcb55c2f6dcbab5430a286e5
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Jul 21 16:34:01 2018 +0200

    INFRA-16749, INFRA-16768
     - Followup cleanup under all circumstances.
       Wrong location for cleanup.
---
 vars/asfMavenTlpPlgnBuild.groovy | 6 ++----
 vars/asfMavenTlpStdBuild.groovy  | 5 ++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/vars/asfMavenTlpPlgnBuild.groovy b/vars/asfMavenTlpPlgnBuild.groovy
index b94a712..04ad853 100644
--- a/vars/asfMavenTlpPlgnBuild.groovy
+++ b/vars/asfMavenTlpPlgnBuild.groovy
@@ -158,13 +158,11 @@ def doCreateTask( os, jdk, maven, tasks, first, plan, taskContext )
           } else {
             echo "[FAIL FAST] ${taskContext.failingFast} had first failure, ignoring ${e.message}"
           }
-        } finally {
-          // always clean workspace
-          cleanWs()
-        }
+        } 
       }
       stage("Build ${stageId}") {
         if (taskContext.failingFast != null) {
+          cleanWs()
           echo "[FAIL FAST] ${taskContext.failingFast} has failed. Skipping ${stageId}."
         } else try {
           withMaven(jdk:jdkName, maven:mvnName, mavenLocalRepo:'.repository', options: [
diff --git a/vars/asfMavenTlpStdBuild.groovy b/vars/asfMavenTlpStdBuild.groovy
index fd9bdee..5b2b80e 100644
--- a/vars/asfMavenTlpStdBuild.groovy
+++ b/vars/asfMavenTlpStdBuild.groovy
@@ -95,12 +95,11 @@ def call(Map params = [:]) {
                 } else {
                   echo "[FAIL FAST] ${failingFast} had first failure, ignoring ${e.message}"
                 }
-              } finally {
-                cleanWs()
-              }
+              } 
             }
             stage("Build ${stageId}") {
               if (failingFast != null) {
+                cleanWs()
                 echo "[FAIL FAST] ${failingFast} has failed. Skipping ${stageId}."
               } else try {
                 // mavenSettingsConfig: 'simple-deploy-settings-no-mirror',