From: Sage Weil <sage@redhat.com>
Date: Thu, 15 Dec 2016 20:10:28 +0000 (-0500)
Subject: qa/workunits: use relative path instead of wget from git
X-Git-Tag: v0.94.10~16^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eaa51f6f907019727eb18fc4174fe4f2d04f396a;p=ceph.git

qa/workunits: use relative path instead of wget from git

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit cf294777ea92f0911813a7132068584d4f73a65a)

Conflicts: (all trivial)
	qa/workunits/fs/test_python.sh
	qa/workunits/rados/test_python.sh
	qa/workunits/rbd/rbd_mirror.sh
	qa/workunits/rbd/rbd_mirror_stress.sh
	qa/workunits/rbd/test_librbd_python.sh
	qa/workunits/rbd/test_lock_fence.sh
---

diff --git a/qa/workunits/rados/test_python.sh b/qa/workunits/rados/test_python.sh
index 39595fe33298..60832df026cb 100755
--- a/qa/workunits/rados/test_python.sh
+++ b/qa/workunits/rados/test_python.sh
@@ -1,8 +1,4 @@
 #!/bin/sh -ex
 
-CEPH_REF=${CEPH_REF:-master}
-#wget -q https://raw.github.com/ceph/ceph/$CEPH_REF/src/test/pybind/test_rados.py
-wget -O test_rados.py "https://ceph.com/git/?p=ceph.git;a=blob_plain;hb=$CEPH_REF;f=src/test/pybind/test_rados.py" || \
-    wget -O test_rados.py "https://ceph.com/git/?p=ceph.git;a=blob_plain;hb=ref/heads/$CEPH_REF;f=src/test/pybind/test_rados.py"
-nosetests -v test_rados
+${PYTHON:-python} -m nose -v $(dirname $0)/../../../src/test/pybind/test_rados
 exit 0
diff --git a/qa/workunits/rbd/notify_master.sh b/qa/workunits/rbd/notify_master.sh
index 3d1b2243c56c..6ebea31ec805 100755
--- a/qa/workunits/rbd/notify_master.sh
+++ b/qa/workunits/rbd/notify_master.sh
@@ -1,7 +1,5 @@
 #!/bin/sh -ex
 
-CEPH_REF=${CEPH_REF:-master}
-wget -O test_notify.py "https://git.ceph.com/?p=ceph.git;a=blob_plain;hb=$CEPH_REF;f=src/test/librbd/test_notify.py"
-
-python test_notify.py master
+relpath=$(dirname $0)/../../../src/test/librbd
+python $relpath/test_notify.py master
 exit 0
diff --git a/qa/workunits/rbd/notify_slave.sh b/qa/workunits/rbd/notify_slave.sh
index e94894ac5b87..ea66161aefa2 100755
--- a/qa/workunits/rbd/notify_slave.sh
+++ b/qa/workunits/rbd/notify_slave.sh
@@ -1,7 +1,5 @@
 #!/bin/sh -ex
 
-CEPH_REF=${CEPH_REF:-master}
-wget -O test_notify.py "https://git.ceph.com/?p=ceph.git;a=blob_plain;hb=$CEPH_REF;f=src/test/librbd/test_notify.py"
-
-python test_notify.py slave
+relpath=$(dirname $0)/../../../src/test/librbd
+python $relpath/test_notify.py slave
 exit 0
diff --git a/qa/workunits/rbd/test_librbd_python.sh b/qa/workunits/rbd/test_librbd_python.sh
index 0d89b369d024..72c975e4e646 100755
--- a/qa/workunits/rbd/test_librbd_python.sh
+++ b/qa/workunits/rbd/test_librbd_python.sh
@@ -1,8 +1,5 @@
 #!/bin/sh -ex
 
-CEPH_REF=${CEPH_REF:-master}
-#wget -q https://raw.github.com/ceph/ceph/$CEPH_REF/src/test/pybind/test_rbd.py
-wget -O test_rbd.py "https://ceph.com/git/?p=ceph.git;a=blob_plain;hb=$CEPH_REF;f=src/test/pybind/test_rbd.py" || \
-    wget -O test_rbd.py "https://ceph.com/git/?p=ceph.git;a=blob_plain;hb=ref/heads/$CEPH_REF;f=src/test/pybind/test_rbd.py"
-nosetests -v test_rbd
+relpath=$(dirname $0)/../../../src/test/pybind
+nosetests -v $relpath/test_rbd
 exit 0
diff --git a/qa/workunits/rbd/test_lock_fence.sh b/qa/workunits/rbd/test_lock_fence.sh
index dc34cb1deb1e..a688ea62d614 100755
--- a/qa/workunits/rbd/test_lock_fence.sh
+++ b/qa/workunits/rbd/test_lock_fence.sh
@@ -3,10 +3,8 @@
 
 IMAGE=rbdrw-image
 LOCKID=rbdrw
-RBDRW=rbdrw.py
-CEPH_REF=${CEPH_REF:-master}
-
-wget -O $RBDRW "https://ceph.com/git/?p=ceph.git;a=blob_plain;hb=$CEPH_REF;f=src/test/librbd/rbdrw.py"
+RELPATH=$(dirname $0)/../../../src/test/pybind
+RBDRW=$RELPATH/rbdrw.py
 
 rbd create $IMAGE --size 10 --image-format 2 --image-shared || exit 1