From b9c2e5a12c3f9e1061550e3807b1a02e387b2fab Mon Sep 17 00:00:00 2001
From: Manuele Simi <manuele.simi@isti.cnr.it>
Date: Thu, 10 Oct 2019 10:18:12 -0400
Subject: [PATCH] Restore release-dry-run. Remove build number from the repo
 path.

---
 Jenkinsfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 06db8d8..51aaac4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -77,7 +77,7 @@ pipeline {
     // see https://jenkins.io/doc/book/pipeline/syntax/#parameters
     parameters {
         choice(name: 'Type',
-                choices: ['SNAPSHOT-DRY-RUN', 'SNAPSHOT', 'STAGING', 'RELEASE'],
+                choices: ['SNAPSHOT-DRY-RUN', 'SNAPSHOT', 'STAGING', 'RELEASE-DRY-RUN, 'RELEASE'],
                 description: 'The type of artifacts the build is expected to generate')
 
         string(name: 'gCube_release_version',
@@ -92,7 +92,7 @@ pipeline {
                 sh '''
                 echo "Create a fresh local repository"
                 rm -rf $MAVEN_LOCAL_REPO
-                mkdir -p $MAVEN_LOCAL_REPO/${PIPELINE_BUILD_NUMBER}/
+                mkdir -p $MAVEN_LOCAL_REPO
                 echo "Done with local repository"
                 '''
 
@@ -103,7 +103,7 @@ pipeline {
             steps {
                 echo build(job: 'maven-parent', wait: true,
                         parameters: [[$class: 'StringParameterValue', name: 'gcube_settings', value: "${maven_settings_file}"],
-                                     [$class: 'StringParameterValue', name: 'local_repo', value: "${maven_local_repo_path}/${PIPELINE_BUILD_NUMBER}"],
+                                     [$class: 'StringParameterValue', name: 'local_repo', value: "${maven_local_repo_path}"],
                                      [$class: 'LabelParameterValue', name: 'exec_label', label: "CD", nodeEligibility: [$class: 'AllNodeEligibility']]
                         ]).result
                 echo "Done with maven-parent"
@@ -198,7 +198,7 @@ def buildComponents(args, maven_settings_file, maven_local_repo_path) {
                 if (name && !"NONE".equalsIgnoreCase(name))
                     build(job: name,
                             parameters: [[$class: 'StringParameterValue', name: 'gcube_settings', value: "${maven_settings_file}"],
-                                         [$class: 'StringParameterValue', name: 'local_repo', value: "${maven_local_repo_path}/${PIPELINE_BUILD_NUMBER}"],
+                                         [$class: 'StringParameterValue', name: 'local_repo', value: "${maven_local_repo_path}"],
                                          [$class: 'LabelParameterValue', name: 'exec_label', label: "CD", nodeEligibility: [$class: 'AllNodeEligibility']]
                             ])
                 }