From d178e328b1f89f65b1338f7eb31a3387aec4b67e Mon Sep 17 00:00:00 2001
From: Manuele Simi <manuele.simi@isti.cnr.it>
Date: Tue, 10 Dec 2019 22:52:40 -0500
Subject: [PATCH] Remove double quotes around the job results.

---
 Jenkinsfile | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 344e1ff..8347962 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -75,8 +75,10 @@ if (resume_from) {
     def previous_report_file = "${agent_root_folder}/build_jobs.${resume_from}.csv"
     echo "Previous report file: ${previous_report_file}"
     jobs = parseJobs(previous_report_file)
-    for (job in jobs)
-        println job
+    if (verbose) {
+        for (job in jobs)
+            println job
+    }
 }
 
 
@@ -157,6 +159,7 @@ pipeline {
                         echo -e "GroupID,ArtifactID,Version,SCM URL,Build Number,Distribution URL,Filename,Packaging" >> ${AGENT_ROOT_FOLDER}/build_commits.csv
 
                         #job report
+                        cat ${PREVIOUS_JOB_REPORT}
                         echo "#Build ${PIPELINE_BUILD_NUMBER}" > ${JOB_REPORT}
                         echo "#StartTime ${date}" >> ${JOB_REPORT}
                         echo -e "JobName,Status" >> ${JOB_REPORT}
@@ -170,7 +173,7 @@ pipeline {
                         if ( ("${resume}" == 'true') && (jobs['maven-parent'] == 'SUCCESS') ) {
                             echo "Skipping maven-parent"
                             // propagate success
-                            sh "echo -e \\\"maven-parent,SUCCESS\\\">> ${agent_root_folder}/build_jobs.${env.BUILD_NUMBER}.csv"
+                            sh "echo -e maven-parent,SUCCESS">> ${agent_root_folder}/build_jobs.${env.BUILD_NUMBER}.csv"
                         } else {
                             def gjob =  build(job: 'maven-parent', wait: true, propagate: true,
                                     parameters: [[$class: 'StringParameterValue', name: 'gcube_settings', value: "${maven_parent_file}"],
@@ -178,7 +181,7 @@ pipeline {
                                                  [$class: 'LabelParameterValue', name: 'exec_label', label: "CD", nodeEligibility: [$class: 'AllNodeEligibility']]
                                     ])
                             echo "Job report file: ${agent_root_folder}/build_jobs.${env.BUILD_NUMBER}.csv"
-                            sh "echo -e \\\"maven-parent,${gjob.getResult()}\\\" >> ${agent_root_folder}/build_jobs.${env.BUILD_NUMBER}.csv"
+                            sh "echo -e maven-parent,${gjob.getResult()}" >> ${agent_root_folder}/build_jobs.${env.BUILD_NUMBER}.csv"
                             echo "Done with maven-parent"
                         }
 
@@ -243,7 +246,7 @@ def buildComponents(args, maven_settings_file, maven_local_repo_path,  jobs) {
                     if ( ("${resume}" == 'true') && (jobs["${name}"] == 'SUCCESS') ) {
                             echo "Skipping ${name}"
                             // propagate success
-                            sh "echo -e \\\"${name},SUCCESS\\\">> ${agent_root_folder}/build_jobs.${env.BUILD_NUMBER}.csv"
+                            sh "echo -e ${name},SUCCESS >> ${agent_root_folder}/build_jobs.${env.BUILD_NUMBER}.csv"
                     } else {
                         def gjob = build(job: name, wait: true, propagate: true,
                             parameters: [[$class: 'StringParameterValue', name: 'gcube_settings', value: "${maven_settings_file}"],
@@ -251,7 +254,7 @@ def buildComponents(args, maven_settings_file, maven_local_repo_path,  jobs) {
                                          [$class: 'LabelParameterValue', name: 'exec_label', label: "CD", nodeEligibility: [$class: 'AllNodeEligibility']]
                             ])
                         echo "Job report file: ${agent_root_folder}/build_jobs.${env.BUILD_NUMBER}.csv"
-                        sh "echo -e \\\"${name},${gjob.getResult()}\\\" >> ${agent_root_folder}/build_jobs.${env.BUILD_NUMBER}.csv"
+                        sh "echo -e ${name},${gjob.getResult()} >> ${agent_root_folder}/build_jobs.${env.BUILD_NUMBER}.csv"
                     }
                 }
             }