From: Alfredo Deza <adeza@redhat.com>
Date: Wed, 5 Oct 2016 14:51:48 +0000 (-0400)
Subject: ceph-docker-pull-requests: remove daemon demo and base from top dir for pull requests
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1f841e2119ba069ac29dc4439f78e775771cb9df;p=ceph-build.git

ceph-docker-pull-requests: remove daemon demo and base from top dir for pull requests

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/ceph-docker-pull-requests/build/build b/ceph-docker-pull-requests/build/build
index ca80c9cf..c210ee47 100644
--- a/ceph-docker-pull-requests/build/build
+++ b/ceph-docker-pull-requests/build/build
@@ -4,7 +4,15 @@ set -ex
 
 sudo apt-get install -y --force-yes docker.io
 docker --version
-cd "$WORKSPACE"
+
+# build scripts in project use this directory as reference
+cd "$WORKSPACE"/ceph-docker
+
+# pull requests tests should never have these directories here, but branches
+# do, so for the build scripts to work correctly, these neeed to be removed
+rm -rf "$WORKSPACE"/ceph-docker/{daemon,demo,base}
+
+
 sudo apt-get install -y --force-yes xfsprogs
 sudo "$WORKSPACE"/ceph-docker/travis-builds/purge_cluster.sh
 sudo "$WORKSPACE"/ceph-docker/travis-builds/build_imgs.sh