Commit c7046ade authored by Harald Sitter's avatar Harald Sitter 💎

properly clean up after oem and regular !secureboot install tests

this was previously removed supposedly because I wanted to use the
workspace as permanent storage. I've since moved to a system which archives
images into a central storage. so we need the cleanup again lest we
leak workspaces
parent fd30941d
......@@ -69,12 +69,30 @@ def fancyNode(label = null, body) {
node(label) {
wrap([$class: 'AnsiColorBuildWrapper', colorMapName: 'xterm']) {
wrap([$class: 'TimestamperBuildWrapper']) {
body()
finally_cleanup { finally_chown { body() } }
}
}
}
}
def finally_chown(body) {
try {
body()
} finally {
sh 'bin/contain.rb chown -R jenkins .'
}
}
def finally_cleanup(body) {
try {
body()
} finally {
if (!env.NO_CLEAN) {
cleanWs()
}
}
}
// When not called from an ISO build we'll want to infer the type from our own name.
def inferType() {
if (!env.JOB_NAME) {
......
......@@ -54,12 +54,30 @@ def fancyNode(label = null, body) {
node(label) {
wrap([$class: 'AnsiColorBuildWrapper', colorMapName: 'xterm']) {
wrap([$class: 'TimestamperBuildWrapper']) {
body()
finally_cleanup { finally_chown { body() } }
}
}
}
}
def finally_chown(body) {
try {
body()
} finally {
sh 'bin/contain.rb chown -R jenkins .'
}
}
def finally_cleanup(body) {
try {
body()
} finally {
if (!env.NO_CLEAN) {
cleanWs()
}
}
}
// When not called from an ISO build we'll want to infer the type from our own name.
def inferType() {
if (!env.JOB_NAME) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment