From b6320b8417f6dcaaad9348d50185e19bcf5877ee Mon Sep 17 00:00:00 2001 From: QXZ3NHY Date: Tue, 20 Jun 2023 11:08:40 +0200 Subject: [PATCH] test - csv --- Jenkinsfile | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e7e7498..7940bdd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,6 +18,7 @@ pipeline { string(name: 'PRESELECT', defaultValue: 'week', description: 'Enter day | week | month (without |) - auto selects the last full day, week or month') string(name: 'SLICES', defaultValue: 'dt', description: 'Enter h | d | t | y (without spaces or |) - writes the slices hourly, daily, total or year to date into excel given in any order') string(name: 'KPI_EXTENSION', defaultValue: 'true', description: 'Enter true or false if the extension should be executed') + string(name: 'FORMATS', defaultValue: 'xc', description: 'Enter x | c (without spaces or |) - creates xlsx (x) and/or CSV (c) file - the csv file will include a reduced list (depending on target report)') } // here comes the trigger according to crontabs - jenkins is in UTC @@ -136,6 +137,14 @@ pipeline { SCRIPT_PARAMETER = SCRIPT_PARAMETER + " -p " + PRESELECT.toString() } + if (FORMATS.isEmpty()) { + currentBuild.result = 'ABORTED' + error('Aborting due to missing report format parameter') + return + } else { + SCRIPT_PARAMETER = SCRIPT_PARAMETER + " -o " + FORMATS.toString() + } + echo "${SCRIPT_PARAMETER}" sh "python3.8 createReport.py ${SCRIPT_PARAMETER}" sh "python3.8 summary.py" @@ -160,14 +169,14 @@ pipeline { script { dir("/opt/workspace/qm_report/") { try { - emailext subject: "NEW ${env.JOB_NAME}", + emailext subject: "THE OFFICIAL ${env.JOB_NAME}", mimeType: 'text/html', body: "Please find the output of the daily QM-Report attached

${summary}", - to: 'ermis.wieger@nttdata.com, Andreas.DB.Danzer@bmwgroup.com, OOC-Support@bmwgroup.com, michaela.jaeger@bmw.de, thilo.bindel@bmwgroup.com, Mohammed.Abadel@bmw.de, jan.sc.schaefer@bmw.de, ops-xibix@list.bmw.com, omo-xibix@list.bmw.com', + // to: 'ermis.wieger@nttdata.com, Andreas.DB.Danzer@bmwgroup.com, OOC-Support@bmwgroup.com, michaela.jaeger@bmw.de, thilo.bindel@bmwgroup.com, Mohammed.Abadel@bmw.de, jan.sc.schaefer@bmw.de, ops-xibix@list.bmw.com, omo-xibix@list.bmw.com', // test: - // to: 'Daniel.Mikula@nttdata.com, Arnel.Arnautovic@nttdata.com', + to: 'Daniel.Mikula@nttdata.com, Arnel.Arnautovic@nttdata.com', replyTo: 'coco-apm@bmw.de', - attachmentsPattern: '*.xlsx' + attachmentsPattern: '*.xlsx, *.csv' } catch ( mailExc ) { echo "Sending Email Failed: ${mailExc}" }