Windows docker build ensure cleanWorkspace cleans build tmp workspace

Signed-off-by: Andrew Leonard <[email protected]>
adoptium · Dec 17, 2024 · 4c1a1f8 · 4c1a1f8
1 parent 207bcc8
commit 4c1a1f8
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/pipelines/build/common/openjdk_build_pipeline.groovy b/pipelines/build/common/openjdk_build_pipeline.groovy
@@ -2199,6 +2199,17 @@ def buildScriptsAssemble(
                                             }
                                             cleanWorkspace = false
                                         }
+                                        // For Windows docker build also clean alternative workspace
+                                        if ( buildConfig.TARGET_OS == 'windows' && buildConfig.DOCKER_IMAGE ) {
+                                            context.ws(workspace) {
+                                                try {
+                                                    context.println "Windows docker build cleaning" + context.WORKSPACE
+                                                    context.cleanWs notFailBuild: true
+                                                } catch (e) {
+                                                    context.println "Failed to clean ${e}"
+                                                }
+                                            }
+                                        }
                                     }
                                 } catch (FlowInterruptedException e) {
                                     throw new Exception("[ERROR] Controller clean workspace timeout (${buildTimeouts.CONTROLLER_CLEAN_TIMEOUT} HOURS) has been reached. Exiting...")