]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
ceph-docker-pull-requests: remove daemon demo and base from top dir for pull requests
authorAlfredo Deza <adeza@redhat.com>
Wed, 5 Oct 2016 14:51:48 +0000 (10:51 -0400)
committerAlfredo Deza <adeza@redhat.com>
Wed, 5 Oct 2016 14:57:38 +0000 (10:57 -0400)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
ceph-docker-pull-requests/build/build

index ca80c9cf4abd265a62aba20c4c79cafe95f0ef68..c210ee47d82095142f05cea9412da8072e1d1181 100644 (file)
@@ -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