From c4b82fb746236abc24e8c5398f1edf003ea4f4a2 Mon Sep 17 00:00:00 2001
From: Simon Quigley <simon@tsimonq2.net>
Date: Thu, 28 May 2020 11:01:00 -0500
Subject: [PATCH] Fix race condition by ensuring workspaces for packages are
 cleaned up before and after builds.

---
 templates/package-stable.xml   | 9 ++++++++-
 templates/package-unstable.xml | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/templates/package-stable.xml b/templates/package-stable.xml
index 0dab2b6..34096c7 100644
--- a/templates/package-stable.xml
+++ b/templates/package-stable.xml
@@ -147,5 +147,12 @@ lintian --fail-on=error,warning -EvIL +pedantic *.dsc *.deb;
       </publishers>
     </org.jenkins__ci.plugins.flexible__publish.FlexiblePublisher>
   </publishers>
-  <buildWrappers/>
+  <buildWrappers>
+    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.38">
+      <deleteDirs>false</deleteDirs>
+      <cleanupParameter></cleanupParameter>
+      <externalDelete></externalDelete>
+      <disableDeferredWipeout>false</disableDeferredWipeout>
+    </hudson.plugins.ws__cleanup.PreBuildCleanup>
+  </buildWrappers>
 </project>
diff --git a/templates/package-unstable.xml b/templates/package-unstable.xml
index 2e4aefd..6b3f4ef 100644
--- a/templates/package-unstable.xml
+++ b/templates/package-unstable.xml
@@ -147,5 +147,12 @@ lintian --fail-on=error,warning --suppress-tags orig-tarball-missing-upstream-si
       </publishers>
     </org.jenkins__ci.plugins.flexible__publish.FlexiblePublisher>
   </publishers>
-  <buildWrappers/>
+  <buildWrappers>
+    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.38">
+      <deleteDirs>false</deleteDirs>
+      <cleanupParameter></cleanupParameter>
+      <externalDelete></externalDelete>
+      <disableDeferredWipeout>false</disableDeferredWipeout>
+    </hudson.plugins.ws__cleanup.PreBuildCleanup>
+  </buildWrappers>
 </project>