[maven-jenkins-lib] branch master updated: added archives fix

[ti...@apache.org]

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

tibordigana 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 8e301fa  added archives fix
8e301fa is described below

commit 8e301fa7c2bdd0e41fc25c6d3d9f6e76b2f2adcd
Author: tibordigana <ti...@apache.org>
AuthorDate: Sun Jul 28 02:05:44 2019 +0200

    added archives fix
---
 vars/asfMavenTlpPlgnBuild.groovy | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/vars/asfMavenTlpPlgnBuild.groovy b/vars/asfMavenTlpPlgnBuild.groovy
index 59d0bc1..cb8b255 100644
--- a/vars/asfMavenTlpPlgnBuild.groovy
+++ b/vars/asfMavenTlpPlgnBuild.groovy
@@ -206,7 +206,7 @@ def doCreateTask( os, jdk, maven, tasks, first, plan, taskContext )
               }
             }
           } catch (Throwable e) {
-            archiveDirs(taskContext.archives)
+            archiveDirs(taskContext.archives, stageDir)
             // First step to keep the workspace clean and safe disk space
             cleanWs()
             if (!taskContext.failFast) {
@@ -227,10 +227,12 @@ def doCreateTask( os, jdk, maven, tasks, first, plan, taskContext )
   }
 }
 
-def archiveDirs(archives) {
+def archiveDirs(archives, stageDir) {
   if (archives != null) {
-    archives.each { archiveFileName, pathToContent ->
-	  zip(zipFile: "${archiveFileName}.zip", dir: pathToContent, archive: true)
-    }
+    dir(stageDir) {
+      archives.each { archivePrefix, pathToContent ->
+	    zip(zipFile: "${archivePrefix}-${stageDir}.zip", dir: pathToContent, archive: true)
+      }
+	}
   }
 }