diff --git a/Jenkinsfile b/Jenkinsfile index 73d1cdf..463cd92 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -71,10 +71,12 @@ if (verbose) { } def report_number = env.BUILD_NUMBER -1 -def jobs = parseJobs("${agent_root_folder}/build_jobs.${report_number}.csv") -for (job in jobs) { - println "$job" -} +def previous_report_file = "${agent_root_folder}/build_jobs.${report_number}.csv" +echo "Previous report file: ${previous_report_file}" +def jobs = parseJobs(previous_report_file) +for (job in jobs) + println job + pipeline { @@ -99,7 +101,7 @@ pipeline { TYPE = "${params.Type}" RESUME = "${params.resume}" JOB_REPORT = "${agent_root_folder}/build_jobs.${env.BUILD_NUMBER}.csv" - PREVIOUS_JOB_REPORT = "${agent_root_folder}/build_jobs.${env.BUILD_NUMBER -1}.csv" + PREVIOUS_JOB_REPORT = "${previous_report_file}" } // see https://jenkins.io/doc/book/pipeline/syntax/#parameters @@ -244,7 +246,7 @@ def buildComponents(args, maven_settings_file, maven_local_repo_path, jobs) { [$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" } } }