From 180e9a0d1fd91a128aca67c0a220a5c52d3e759d Mon Sep 17 00:00:00 2001 From: David Galloway Date: Mon, 29 Jun 2020 11:36:51 -0400 Subject: [PATCH] ceph-dev*build: Delete ceph-container dir on failure Signed-off-by: David Galloway --- ceph-dev-build/build/failure | 7 +++++++ ceph-dev-new-build/build/failure | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/ceph-dev-build/build/failure b/ceph-dev-build/build/failure index 6274d32e..dcd38ebf 100644 --- 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 6274d32e..dcd38ebf 100644 --- 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 -- 2.39.5