Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Revert "Archive artifacts tweak"" #4157

Closed
wants to merge 3 commits into from
Closed

Revert "Revert "Archive artifacts tweak"" #4157

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92f07c8
Revert "Revert "Archive artifacts tweak" (#4154)"
thegreyd May 9, 2024
2d36816
Update jobs/build/prepare-release/Jenkinsfile
thegreyd May 9, 2024
3574736
Update jobs/build/tag-rpms/Jenkinsfile
thegreyd May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions jobs/build/prepare-release/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
8 changes: 3 additions & 5 deletions jobs/build/tag-rpms/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
thegreyd marked this conversation as resolved.
Show resolved Hide resolved
])
buildlib.cleanWorkspace()
}
Expand Down
4 changes: 2 additions & 2 deletions pipeline-scripts/buildlib.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down