Correct workspace clean when autobuild scripts in a custom position

This commit is contained in:
Dan Hawkins 2020-04-13 14:31:12 +01:00
commit bfa48433b6

View file

@ -1,14 +1,14 @@
// Assume that WORKSPACE environment variable is set
autobuildroot = "${WORKSPACE}/autobuild"
autobuildroot = 'autobuild'
commonscriptsroot = "${autobuildroot}/Common_scripts"
metafolderscript = null
def conditionalclean(doclean = "${CLEAN_WORKSPACE}" == "true") {
if (doclean) {
if (doclean) {
echo "Cleaning workspace"
// Save any script files that were loaded into the workspace at first and are required after cleaning the workspace
stash allowEmpty: true, includes: 'autobuild/**', name: 'Clean workspace stash', useDefaultExcludes: false
stash allowEmpty: true, includes: "${autobuildroot}/**', name: 'Clean workspace stash', useDefaultExcludes: false
cleanWs()
unstash name: 'Clean workspace stash'
}