From 92f07c8f6682ff867534250e77078df549a71f6c Mon Sep 17 00:00:00 2001 From: Siddharth Sharma Date: Thu, 9 May 2024 10:30:35 -0400 Subject: [PATCH 1/3] Revert "Revert "Archive artifacts tweak" (#4154)" This reverts commit 23f285efe1c8cf37a18a9d440db8cf3bbc5cff72. --- jobs/build/prepare-release/Jenkinsfile | 14 ++++++++++---- jobs/build/tag-rpms/Jenkinsfile | 8 +++----- pipeline-scripts/buildlib.groovy | 4 ++-- 3 files changed, 15 insertions(+), 11 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/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() } 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 2d36816ff7cda289f009c10e7a88e90370899e81 Mon Sep 17 00:00:00 2001 From: Siddharth Sharma Date: Thu, 9 May 2024 10:31:02 -0400 Subject: [PATCH 2/3] Update jobs/build/prepare-release/Jenkinsfile --- jobs/build/prepare-release/Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jobs/build/prepare-release/Jenkinsfile b/jobs/build/prepare-release/Jenkinsfile index bc0cedc937..d0254b7daf 100644 --- a/jobs/build/prepare-release/Jenkinsfile +++ b/jobs/build/prepare-release/Jenkinsfile @@ -143,10 +143,10 @@ node { "artcd_working/email/**", "artcd_working/doozer_working/*.log", "artcd_working/doozer_working/*.yaml", - "artcd_working/doozer_working/*.yml" + "artcd_working/doozer_working/*.yml", "artcd_working/elliott_working/*.log", "artcd_working/elliott_working/*.yaml", - "artcd_working/elliott_working/*.yml" + "artcd_working/elliott_working/*.yml", "artcd_working/*.json", "artcd_working/*.log", "artcd_working/*.yaml", From 35747360e218221a4b5a701f2dd3361e0aa0804a Mon Sep 17 00:00:00 2001 From: Siddharth Sharma Date: Thu, 9 May 2024 10:31:36 -0400 Subject: [PATCH 3/3] Update jobs/build/tag-rpms/Jenkinsfile --- jobs/build/tag-rpms/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/build/tag-rpms/Jenkinsfile b/jobs/build/tag-rpms/Jenkinsfile index a0af76f887..646ed17db1 100644 --- a/jobs/build/tag-rpms/Jenkinsfile +++ b/jobs/build/tag-rpms/Jenkinsfile @@ -85,7 +85,7 @@ node { commonlib.safeArchiveArtifacts([ "artcd_working/doozer_working/*.log", "artcd_working/doozer_working/*.yaml", - "artcd_working/doozer_working/*.yml" + "artcd_working/doozer_working/*.yml", ]) buildlib.cleanWorkspace() }