From 86d6212439892e0a822ca9cddfd8f7f1d10b8967 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Tue, 17 Dec 2024 15:16:35 +0000 Subject: [PATCH] Windows docker build ensure cleanWorkspace cleans build tmp workspace Signed-off-by: Andrew Leonard --- pipelines/build/common/openjdk_build_pipeline.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pipelines/build/common/openjdk_build_pipeline.groovy b/pipelines/build/common/openjdk_build_pipeline.groovy index a78d63e8b..b5212a4a7 100644 --- a/pipelines/build/common/openjdk_build_pipeline.groovy +++ b/pipelines/build/common/openjdk_build_pipeline.groovy @@ -2199,11 +2199,11 @@ def buildScriptsAssemble( } cleanWorkspace = false } - // For Windows docker build also clean alternative workspace - if ( buildConfig.TARGET_OS == 'windows' && buildConfig.DOCKER_IMAGE ) { + // For Windows build also clean alternative workspace + if ( buildConfig.TARGET_OS == 'windows' ) { context.ws(workspace) { try { - context.println "Windows docker build cleaning" + context.WORKSPACE + context.println "Windows build cleaning" + context.WORKSPACE context.cleanWs notFailBuild: true } catch (e) { context.println "Failed to clean ${e}"