[maven-jenkins-lib] branch master updated: Reduce stageDir

[rfscholte]

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

rfscholte 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 e05a8ac  Reduce stageDir
e05a8ac is described below

commit e05a8ac9726c2fc4d286cbaa2a4ec22abbf8c57e
Author: rfscholte <rfscho...@apache.org>
AuthorDate: Thu Apr 4 20:12:43 2019 +0200

    Reduce stageDir
---
 vars/asfMavenTlpPlgnBuild.groovy | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/vars/asfMavenTlpPlgnBuild.groovy b/vars/asfMavenTlpPlgnBuild.groovy
index d921552..02a667b 100644
--- a/vars/asfMavenTlpPlgnBuild.groovy
+++ b/vars/asfMavenTlpPlgnBuild.groovy
@@ -148,15 +148,17 @@ def doCreateTask( os, jdk, maven, tasks, first, plan, 
taskContext )
   tasks[stageId] = {
     node(jenkinsEnv.nodeSelection(label)) {
       def wsDir = pwd()
+         def stageDir = stageId
          if (os == 'windows' && taskContext.tmpWs) {
 //         wsDir = "$TEMP\\$BUILD_TAG" // or use 
F:\jenkins\jenkins-slave\workspace or F:\short
            wsDir = 'F:\\short\\' + 
"$BUILD_TAG".replaceAll(/(.+)maven-(.+)-plugin(.*)/) { 
"${it[1]}m-${it[2]}-p${it[3]}" }
+               stageDir = "j${jdk}m${maven}${plan}"
          }
       ws( dir : "$wsDir" )
       {
         stage("Checkout ${stageId}") {
           try {
-            dir(stageId) {
+            dir(stageDir) {
               checkout scm
             }
           } catch (Throwable e) {
@@ -189,7 +191,7 @@ def doCreateTask( os, jdk, maven, tasks, first, plan, 
taskContext )
               pipelineGraphPublisher(),
               mavenLinkerPublisher(disabled: false)
            ], publisherStrategy: 'EXPLICIT') {
-             dir (stageId) {
+             dir (stageDir) {
                if (isUnix()) {
                  sh cmd.join(' ')
                } else {