From 9a56280d2d2ad5204339f81270c1d328abaed329 Mon Sep 17 00:00:00 2001 From: kilara77 Date: Wed, 1 Jul 2020 16:21:40 -0400 Subject: [PATCH 1/2] Update Jenkinsfile --- Jenkinsfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 97b91b3d7c..9a32a06b21 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -502,6 +502,10 @@ post{ env.LSONARQUBE_URL="${env.SONAR_URL_OPENFORESTPLATFORM}" emailext attachLog: false, attachmentsPattern: '', body: '''${SCRIPT, template="openforest_simple2.template"}''', mimeType: 'text/html', replyTo: 'notifications@usda.gov', subject: '$PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS!', to: "${MAILING_LIST_OPENFOREST}" } - } + } + + always { + deleteDir() /* clean up our workspace */ + } } } From 3d124f6ea62d8904f0ef21f42b3ec3c835ccc29e Mon Sep 17 00:00:00 2001 From: kilara77 Date: Wed, 1 Jul 2020 17:50:31 -0400 Subject: [PATCH 2/2] Update Jenkinsfile --- Jenkinsfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9a32a06b21..2fee8a8835 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -461,6 +461,7 @@ post{ env.BLUE_OCEAN_URL_SQ_XLSX="${env.BUILD_URL}artifact/sonarqubereports/sonarqubeissuesreport.xlsx" env.LSONARQUBE_URL="${env.SONAR_URL_OPENFORESTPLATFORM}" emailext attachLog: false, attachmentsPattern: '', body: '''${SCRIPT, template="openforest_simple2.template"}''', mimeType: 'text/html', replyTo: 'notifications@usda.gov', subject: '$PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS!', to: "${MAILING_LIST_OPENFOREST}" + deleteDir() /* clean up our workspace */ } } @@ -501,11 +502,9 @@ post{ env.BLUE_OCEAN_URL_SQ_XLSX="${env.BUILD_URL}artifact/sonarqubereports/sonarqubeissuesreport.xlsx" env.LSONARQUBE_URL="${env.SONAR_URL_OPENFORESTPLATFORM}" emailext attachLog: false, attachmentsPattern: '', body: '''${SCRIPT, template="openforest_simple2.template"}''', mimeType: 'text/html', replyTo: 'notifications@usda.gov', subject: '$PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS!', to: "${MAILING_LIST_OPENFOREST}" + deleteDir() /* clean up our workspace */ } } - always { - deleteDir() /* clean up our workspace */ - } } }