From: Alfredo Deza <adeza@redhat.com>
Date: Wed, 5 Oct 2016 11:32:39 +0000 (-0400)
Subject: ceph-docker-pull-requests: define better the right path where to execute from
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F507%2Fhead;p=ceph-build.git

ceph-docker-pull-requests: define better the right path where to execute from

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 8869696a..ca80c9cf 100644
--- a/ceph-docker-pull-requests/build/build
+++ b/ceph-docker-pull-requests/build/build
@@ -4,27 +4,28 @@ set -ex
 
 sudo apt-get install -y --force-yes docker.io
 docker --version
+cd "$WORKSPACE"
 sudo apt-get install -y --force-yes xfsprogs
-sudo "$WORKSPACE"/travis-builds/purge_cluster.sh
-sudo "$WORKSPACE"/travis-builds/build_imgs.sh
+sudo "$WORKSPACE"/ceph-docker/travis-builds/purge_cluster.sh
+sudo "$WORKSPACE"/ceph-docker/travis-builds/build_imgs.sh
 
 # NOTE(leseb): somehow putting everything in a 'script' task does not work
 # so we have to split it up that way.
 # It seems that we have an issue when not running 'docker run' from an install step
 #install:
-sudo "$WORKSPACE"/travis-builds/prepare_osd_fs.sh
+sudo "$WORKSPACE"/ceph-docker/travis-builds/prepare_osd_fs.sh
 sudo docker run -d --name ceph-mon --net=host -v /etc/ceph:/etc/ceph -v /var/lib/ceph:/var/lib/ceph -e MON_IP=$(ip -4 -o a | awk '/eth|ens|eno|enp/ { sub ("/..", "", $4); print $4 }') -e CEPH_PUBLIC_NETWORK=$(grep -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}/[0-9]\{1,2\}' /proc/net/fib_trie | grep -vE "^127|0$" | head -1) daemon mon
-sudo "$WORKSPACE"/travis-builds/bootstrap_osd.sh
+sudo "$WORKSPACE"/ceph-docker/travis-builds/bootstrap_osd.sh
 sudo docker run -d --name ceph-osd --net=host -v /etc/ceph:/etc/ceph -v /var/lib/ceph:/var/lib/ceph daemon osd_directory_single
 sudo docker run -d --name ceph-mds --net=host -v /etc/ceph:/etc/ceph -v /var/lib/ceph:/var/lib/ceph -e CEPHFS_CREATE=1 daemon mds
 sudo docker run -d --name ceph-rgw --net=host -v /etc/ceph:/etc/ceph -v /var/lib/ceph:/var/lib/ceph daemon rgw
 
 #script:
-sudo "$WORKSPACE"/travis-builds/validate_cluster.sh
-sudo "$WORKSPACE"/travis-builds/purge_cluster.sh
-sudo "$WORKSPACE"/travis-builds/prepare_osd_fs.sh
+sudo "$WORKSPACE"/ceph-docker/travis-builds/validate_cluster.sh
+sudo "$WORKSPACE"/ceph-docker/travis-builds/purge_cluster.sh
+sudo "$WORKSPACE"/ceph-docker/travis-builds/prepare_osd_fs.sh
 sudo docker run -d --name ceph-demo --net=host -v /etc/ceph:/etc/ceph -v /var/lib/ceph:/var/lib/ceph -e MON_IP=$(ip -4 -o a | awk '/eth|ens|eno|enp/ { sub ("/..", "", $4); print $4 }') -e CEPH_PUBLIC_NETWORK=$(grep -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}/[0-9]\{1,2\}' /proc/net/fib_trie | grep -vE "^127|0$" | head -1) demo
-sudo "$WORKSPACE"/travis-builds/validate_demo_cluster.sh
+sudo "$WORKSPACE"/ceph-docker/travis-builds/validate_demo_cluster.sh
 
 # on success
 sudo docker exec ceph-mon ceph -s