From f74718b5e744b7e6919375ddbf4eef8e057446ce Mon Sep 17 00:00:00 2001
From: Manuele Simi <manuele.simi@isti.cnr.it>
Date: Wed, 16 Oct 2019 21:09:11 -0400
Subject: [PATCH] Clean up some code in the pipeline.

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

diff --git a/Jenkinsfile b/Jenkinsfile
index cb4ef8e..4495a40 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,7 +5,6 @@ import org.yaml.snakeyaml.Yaml
 def (options, maven_local_repo_path, maven_settings_file) = ['', '', '']
 def maven_jdk = 'OpenJDK 8'
 def agent_root_folder = '/var/lib/jenkins/.m2'
-//def agent_label = 'pipeline-agent-garr' //'pipeline-agent'
 
 if (params.Type == 'SNAPSHOT-DRY-RUN') {
     echo "Configure Maven for SNAPSHOT-DRY-RUN artifacts"
@@ -26,7 +25,7 @@ if (params.Type == 'RELEASE-DRY-RUN') {
     maven_settings_file = "jenkins-releases-dry-run-settings.xml"
 }
 if (params.Type == 'STAGING') {
-    echo "Configure Maven for RELEASE-STAGING artifacts"
+    echo "Configure Maven for STAGING artifacts"
     options = ''
     maven_local_repo_path = "local-staging"
     maven_settings_file = "jenkins-staging-settings.xml"
@@ -36,8 +35,8 @@ if (params.Type == 'RELEASE') {
     options = ''
     maven_local_repo_path = "local-releases"
     maven_settings_file = "jenkins-releases-settings.xml"
-    echo "This will fail. RELEASES are currently disabled until further testing."
 }
+
 echo "Use settings file at ${maven_settings_file}"
 echo "Use local repo at ${maven_local_repo_path}"
 echo "Release number: ${params.gCube_release_version}"
@@ -45,8 +44,7 @@ echo "Clean up gcube local artifacts? ${params.cleanup_gcube_artifacts}"
 echo "Clean up all local artifacts? ${params.cleanup_local_repo}"
 
 
-
-//locate where this release is
+//locate the release file
 String releaseURL = "https://code-repo.d4science.org/gCubeCI/gCubeRelease/raw/branch/master/releases/gcube-${gCube_release_version}.yaml"
 
 println "Querying ${releaseURL}"