From 2f8bcdfe573e1aeb5f66ce48947ef0a84083219d Mon Sep 17 00:00:00 2001 From: Siddharth Sharma Date: Mon, 6 May 2024 16:55:47 -0400 Subject: [PATCH 1/2] Archive and cleanworkspace tweak --- jobs/build/prepare-release/Jenkinsfile | 14 ++++++++++---- pipeline-scripts/buildlib.groovy | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/jobs/build/prepare-release/Jenkinsfile b/jobs/build/prepare-release/Jenkinsfile index 043c18f8f0..bc0cedc937 100644 --- a/jobs/build/prepare-release/Jenkinsfile +++ b/jobs/build/prepare-release/Jenkinsfile @@ -141,10 +141,16 @@ node { } finally { commonlib.safeArchiveArtifacts([ "artcd_working/email/**", - "artcd_working/**/*.json", - "artcd_working/**/*.log", - "artcd_working/**/*.yaml", - "artcd_working/**/*.yml", + "artcd_working/doozer_working/*.log", + "artcd_working/doozer_working/*.yaml", + "artcd_working/doozer_working/*.yml" + "artcd_working/elliott_working/*.log", + "artcd_working/elliott_working/*.yaml", + "artcd_working/elliott_working/*.yml" + "artcd_working/*.json", + "artcd_working/*.log", + "artcd_working/*.yaml", + "artcd_working/*.yml", ]) buildlib.cleanWorkspace() } diff --git a/pipeline-scripts/buildlib.groovy b/pipeline-scripts/buildlib.groovy index 57ebf0c00f..6d436cc8c0 100644 --- a/pipeline-scripts/buildlib.groovy +++ b/pipeline-scripts/buildlib.groovy @@ -647,8 +647,8 @@ def watch_brew_task_and_retry(name, taskId, brewUrl) { } } -def cleanWorkspace() { - cleanWs(cleanWhenFailure: false, notFailBuild: true) +def cleanWorkspace(cleanWhenFailure=true) { + cleanWs(cleanWhenFailure: cleanWhenFailure, notFailBuild: true) dir("${workspace}@tmp") { deleteDir() } From 17f9ed8805a89a4b33327d378ef4a825adb444dc Mon Sep 17 00:00:00 2001 From: Siddharth Sharma Date: Tue, 7 May 2024 09:29:21 -0400 Subject: [PATCH 2/2] tag rpms too --- jobs/build/tag-rpms/Jenkinsfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/jobs/build/tag-rpms/Jenkinsfile b/jobs/build/tag-rpms/Jenkinsfile index 3c88911bee..a0af76f887 100644 --- a/jobs/build/tag-rpms/Jenkinsfile +++ b/jobs/build/tag-rpms/Jenkinsfile @@ -83,11 +83,9 @@ node { throw err } finally { commonlib.safeArchiveArtifacts([ - "artcd_working/email/**", - "artcd_working/**/*.json", - "artcd_working/**/*.log", - "artcd_working/**/*.yaml", - "artcd_working/**/*.yml", + "artcd_working/doozer_working/*.log", + "artcd_working/doozer_working/*.yaml", + "artcd_working/doozer_working/*.yml" ]) buildlib.cleanWorkspace() }