From c5216cebda4eb4098c38b7f6f57f033d5bbce681 Mon Sep 17 00:00:00 2001
From: Manuele Simi <manuele.simi@isti.cnr.it>
Date: Sun, 8 Dec 2019 23:21:40 -0500
Subject: [PATCH] Fix the env variables.

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 697cc51..3805972 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -92,8 +92,8 @@ pipeline {
         PIPELINE_BUILD_NUMBER = "${env.BUILD_NUMBER}"
         TYPE = "${params.Type}"
         RESUME = "${params.resume}"
-        JOB_REPORT = "${AGENT_ROOT_FOLDER}/build_jobs.${PIPELINE_BUILD_NUMBER}.csv"
-        PREVIOUS_JOB_REPORT = "${AGENT_ROOT_FOLDER}/build_jobs.${PIPELINE_BUILD_NUMBER -1}.csv"
+        JOB_REPORT = "${agent_root_folder}/build_jobs.${env.BUILD_NUMBER}.csv"
+        PREVIOUS_JOB_REPORT = "${agent_root_folder}/build_jobs.${env.BUILD_NUMBER -1}.csv"
 
     }
 
@@ -158,15 +158,18 @@ pipeline {
         stage('build maven-parent') {
             steps {
                 script {
-
+                    if ( ("${resume}" == 'true') && (wasSuccess('maven-parent')) ) {
+                        // propagate success
+                        sh "echo -e \\\"maven-parent,SUCCESS\\\">> $JOB_REPORT"
+                    } else {
                         def gjob =  build(job: 'maven-parent', wait: true, propagate: true,
                                 parameters: [[$class: 'StringParameterValue', name: 'gcube_settings', value: "${maven_parent_file}"],
                                              [$class: 'StringParameterValue', name: 'local_repo', value: "${maven_local_repo_path}"],
                                              [$class: 'LabelParameterValue', name: 'exec_label', label: "CD", nodeEligibility: [$class: 'AllNodeEligibility']]
                                 ])
-                        //sh "echo -e \\\"maven-parent,${gjob.getResult()}\\\">> $JOB_REPORT"
+                        sh "echo -e \\\"maven-parent,${gjob.getResult()}\\\">> $JOB_REPORT"
                         echo "Done with maven-parent"
-
+                    }
                 }
             }
         }
@@ -224,15 +227,18 @@ def buildComponents(args, maven_settings_file, maven_local_repo_path, resume) {
         parallel args.items?.collectEntries { name ->
             ["${name}": {
                 if (name && !"NONE".equalsIgnoreCase(name)) {
-
+                    if ( (resume == 'true') && (wasSuccess(name)) ) {
+                        // propagate success
+                        sh "echo -e \\\"${name},SUCCESS\\\">> $JOB_REPORT"
+                    } else {
                         def gjob = build job: name, propagate: true, wait: true,
                                                 parameters: [[$class: 'StringParameterValue', name: 'gcube_settings', value: "${maven_settings_file}"],
                                                              [$class: 'StringParameterValue', name: 'local_repo', value: "${maven_local_repo_path}"],
                                                              [$class: 'LabelParameterValue', name: 'exec_label', label: "CD", nodeEligibility: [$class: 'AllNodeEligibility']]
                                                 ]
-                        //sh "echo -e \\\"${name},${gjob.getResult()}\\\">> $JOB_REPORT"
+                        sh "echo -e \\\"${name},${gjob.getResult()}\\\">> $JOB_REPORT"
                         println "job results: ${gjob.getResult()}"
-
+                    }
                 }
             }]
         }