commit f0ee406cd02161b500ae7b96f5011eb97757236c
author Karl Heinz Marbaise <khmarbaise@apache.org> Sat Jul 21 16:28:53 2018 +0200
committer Karl Heinz Marbaise <khmarbaise@apache.org> Sat Jul 21 16:29:57 2018 +0200
tree 3c963e3e259d7eab5d0786a3a2732490faa9234c
parent 568d09f780606582749efb9ec70e6f4e1567e8dc

INFRA-16749, INFRA-16768
 - Followup cleanup under all circumstances.

vars/asfMavenTlpPlgnBuild.groovy

diff --git a/vars/asfMavenTlpPlgnBuild.groovy b/vars/asfMavenTlpPlgnBuild.groovy
index 6875aa6..b94a712 100644
--- a/vars/asfMavenTlpPlgnBuild.groovy
+++ b/vars/asfMavenTlpPlgnBuild.groovy
@@ -158,6 +158,9 @@
           } else {
             echo "[FAIL FAST] ${taskContext.failingFast} had first failure, ignoring ${e.message}"
           }
+        } finally {
+          // always clean workspace
+          cleanWs()
         }
       }
       stage("Build ${stageId}") {
@@ -193,6 +196,8 @@
           } else {
             echo "[FAIL FAST] ${taskContext.failingFast} had first failure, ignoring ${e.message}"
           }
+        } finally {
+          cleanWs()
         }
       }
 	  }

vars/asfMavenTlpStdBuild.groovy

diff --git a/vars/asfMavenTlpStdBuild.groovy b/vars/asfMavenTlpStdBuild.groovy
index c5d4098..fd9bdee 100644
--- a/vars/asfMavenTlpStdBuild.groovy
+++ b/vars/asfMavenTlpStdBuild.groovy
@@ -95,6 +95,8 @@
                 } else {
                   echo "[FAIL FAST] ${failingFast} had first failure, ignoring ${e.message}"
                 }
+              } finally {
+                cleanWs()
               }
             }
             stage("Build ${stageId}") {
@@ -132,6 +134,8 @@
                 } else {
                   echo "[FAIL FAST] ${failingFast} had first failure, ignoring ${e.message}"
                 }
+              } finally {
+                cleanWs()
               }
             }
           }