From: Andrew Schoen <aschoen@redhat.com>
Date: Fri, 6 Nov 2015 16:44:05 +0000 (-0600)
Subject: ceph-deploy: set wipe-workspace to true and remove cleanup code
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6d6b2d2a4352e573ceff21e43be342268521280a;p=ceph-build.git

ceph-deploy: set wipe-workspace to true and remove cleanup code

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
---

diff --git a/ceph-deploy/build/build b/ceph-deploy/build/build
index 3ea35246..07ddc9ca 100644
--- a/ceph-deploy/build/build
+++ b/ceph-deploy/build/build
@@ -32,8 +32,6 @@ listcontains() {
 
 if listcontains $DIST "$rpm_dists"
 then
-        rm -rf rpm-repo dist/* build/rpmbuild
-
         # Tag tree and update version number in change log and
         # in setup.py before building.
 
@@ -77,15 +75,10 @@ then
         find ${BUILDAREA}/SRPMS | grep rpm | chacractl binary ${chacra_flags} create ${chacra_baseurl}/source
         find ${BUILDAREA}/RPMS/* | grep rpm | chacractl binary ${chacra_flags} create ${chacra_baseurl}/${ARCH}
 
-        cd $WORKSPACE
-        mkdir -p dist
         exit 0
 
 elif listcontains $DIST "$deb_dists"
 then
-        rm -rf debian-repo
-        rm -rf dist
-        rm -f ../*.changes ../*.dsc ../*.gz ../*.diff
 
     # Tag tree and update version number in change log and
     # in setup.py before building.
@@ -115,10 +108,6 @@ then
         exit 1
     fi
 
-    # Clean up any leftover builds
-    rm -f ../ceph-deploy*.dsc ../ceph-deploy*.changes ../ceph-deploy*.deb ../ceph-deploy.tgz
-    rm -rf ./debian-repo
-
     # Apply backport tag if release build
     if [ $RELEASE -eq 1 ] ; then
         DEB_VERSION=$(dpkg-parsechangelog | sed -rne 's,^Version: (.*),\1, p')
diff --git a/ceph-deploy/config/definitions/ceph-deploy.yml b/ceph-deploy/config/definitions/ceph-deploy.yml
index deafb9e5..9acba66b 100644
--- a/ceph-deploy/config/definitions/ceph-deploy.yml
+++ b/ceph-deploy/config/definitions/ceph-deploy.yml
@@ -43,6 +43,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if
           browser-url: http://github.com/ceph/ceph-deploy.git
           skip-tag: true
           timeout: 20
+          wipe-workspace: true
 
     axes:
       - axis: