From bfa48433b643418c9b65bc396278a6a3b67d2182 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 13 Apr 2020 14:31:12 +0100 Subject: [PATCH] Correct workspace clean when autobuild scripts in a custom position --- autobuilder.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/autobuilder.groovy b/autobuilder.groovy index ccc32c1..d78eab0 100644 --- a/autobuilder.groovy +++ b/autobuilder.groovy @@ -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' }