ceph-dev*build: Delete ceph-container dir on failure

Signed-off-by: David Galloway <dgallowa@redhat.com>

diff --git a/ceph-dev-build/build/failure b/ceph-dev-build/build/failure
index 6274d32e96b074ab24866f8d4633297c4415b515..dcd38ebf6b82592f3fb0b4b4d40ea0c4a10d1086 100644 (file)
--- a/ceph-dev-build/build/failure
+++ b/ceph-dev-build/build/failure
@@ -1,5 +1,12 @@
 #!/bin/bash -ex
 
+# The ceph-container dir is supposed to get deleted in the build_rpm script.
+# We used to add '|| true' to the container build so the dir would still get
+# deleted even if it failed.  This changed in https://github.com/ceph/ceph-build/pull/1603
+# So now we need to delete the directory or the Wipe Workspace plugin will fail on the next build.
+cd $WORKSPACE
+sudo rm -rf ceph-container
+
 # note: the failed_build_status call relies on normalized variable names that
 # are infered by the builds themselves. If the build fails before these are
 # set, they will be posted with empty values

diff --git a/ceph-dev-new-build/build/failure b/ceph-dev-new-build/build/failure
index 6274d32e96b074ab24866f8d4633297c4415b515..dcd38ebf6b82592f3fb0b4b4d40ea0c4a10d1086 100644 (file)
--- a/ceph-dev-new-build/build/failure
+++ b/ceph-dev-new-build/build/failure
@@ -1,5 +1,12 @@
 #!/bin/bash -ex
 
+# The ceph-container dir is supposed to get deleted in the build_rpm script.
+# We used to add '|| true' to the container build so the dir would still get
+# deleted even if it failed.  This changed in https://github.com/ceph/ceph-build/pull/1603
+# So now we need to delete the directory or the Wipe Workspace plugin will fail on the next build.
+cd $WORKSPACE
+sudo rm -rf ceph-container
+
 # note: the failed_build_status call relies on normalized variable names that
 # are infered by the builds themselves. If the build fails before these are
 # set, they will be posted with empty values