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

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

Conflicts:
	qa/workunits/rados/test_python.sh (nosetests instead of nose)

diff --git a/qa/workunits/fs/test_python.sh b/qa/workunits/fs/test_python.sh
index ea0af66e81e560eb365a7630da2badfd31c625fe..7613dcf45dcb52bd779e5cef7e02b217d6ff2e24 100755 (executable)
--- a/qa/workunits/fs/test_python.sh
+++ b/qa/workunits/fs/test_python.sh
@@ -1,10 +1,6 @@
 #!/bin/sh -ex
 
-CEPH_REF=${CEPH_REF:-master}
-wget -O test_cephfs.py "https://git.ceph.com/?p=ceph.git;a=blob_plain;hb=$CEPH_REF;f=src/test/pybind/test_cephfs.py" || \
-    wget -O test_cephfs.py "https://git.ceph.com/?p=ceph.git;a=blob_plain;hb=ref/heads/$CEPH_REF;f=src/test/pybind/test_cephfs.py"
-
 # Running as root because the filesystem root directory will be
 # owned by uid 0, and that's where we're writing.
-sudo nosetests -v test_cephfs
+sudo nosetests -v $(dirname $0)/../../../src/test/pybind/test_cephfs
 exit 0

diff --git a/qa/workunits/rados/test_python.sh b/qa/workunits/rados/test_python.sh
index 2aaff2d15fd8efa7187f3b95c12d61d1388b08a1..a5c792977dc7aad80622cba99aa3f73a1e443fe2 100755 (executable)
--- 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://git.ceph.com/?p=ceph.git;a=blob_plain;hb=$CEPH_REF;f=src/test/pybind/test_rados.py" || \
-    wget -O test_rados.py "https://git.ceph.com/?p=ceph.git;a=blob_plain;hb=ref/heads/$CEPH_REF;f=src/test/pybind/test_rados.py"
-nosetests -v test_rados
+nosetests -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 3d1b2243c56c0a612e39a4186c5b48a63b9eb419..6ebea31ec8055947820987299b4355a856a25173 100755 (executable)
--- 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 e94894ac5b87adbd0645f13ef235270eb8fe4dbb..ea66161aefa249bb86e44b5e4b60204884646fac 100755 (executable)
--- 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/rbd_mirror.sh b/qa/workunits/rbd/rbd_mirror.sh
index fcfae98004d6302ec98c720b4918176ad689fdf5..560f909a00be97359b38d76f5105ba7bbe37f05f 100755 (executable)
--- a/qa/workunits/rbd/rbd_mirror.sh
+++ b/qa/workunits/rbd/rbd_mirror.sh
@@ -7,12 +7,7 @@
 # socket, temporary files, and launches rbd-mirror daemon.
 #
 
-if [ -n "${CEPH_REF}" ]; then
-  wget -O rbd_mirror_helpers.sh "https://git.ceph.com/?p=ceph.git;a=blob_plain;hb=$CEPH_REF;f=qa/workunits/rbd/rbd_mirror_helpers.sh"
-  . ./rbd_mirror_helpers.sh
-else
-  . $(dirname $0)/rbd_mirror_helpers.sh
-fi
+. $(dirname $0)/rbd_mirror_helpers.sh
 
 testlog "TEST: add image and test replay"
 start_mirror ${CLUSTER1}

diff --git a/qa/workunits/rbd/rbd_mirror_stress.sh b/qa/workunits/rbd/rbd_mirror_stress.sh
index e9ed2ce7c6cbfb44450e64af612d9a2a52447369..fe0f608ddc166f5d71288bec471a74297dd5c4f8 100755 (executable)
--- a/qa/workunits/rbd/rbd_mirror_stress.sh
+++ b/qa/workunits/rbd/rbd_mirror_stress.sh
@@ -11,12 +11,7 @@
 IMAGE_COUNT=50
 export LOCKDEP=0
 
-if [ -n "${CEPH_REF}" ]; then
-  wget -O rbd_mirror_helpers.sh "https://git.ceph.com/?p=ceph.git;a=blob_plain;hb=$CEPH_REF;f=qa/workunits/rbd/rbd_mirror_helpers.sh"
-  . ./rbd_mirror_helpers.sh
-else
-  . $(dirname $0)/rbd_mirror_helpers.sh
-fi
+. $(dirname $0)/rbd_mirror_helpers.sh
 
 create_snap()
 {

diff --git a/qa/workunits/rbd/test_librbd_python.sh b/qa/workunits/rbd/test_librbd_python.sh
index 8f02f862ab828da892bc4e82cf87f9295bf3c40a..0e607eec43869ef309ce465a91b7c421ee8ecb87 100755 (executable)
--- a/qa/workunits/rbd/test_librbd_python.sh
+++ b/qa/workunits/rbd/test_librbd_python.sh
@@ -1,14 +1,11 @@
 #!/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://git.ceph.com/?p=ceph.git;a=blob_plain;hb=$CEPH_REF;f=src/test/pybind/test_rbd.py" || \
-    wget -O test_rbd.py "https://git.ceph.com/?p=ceph.git;a=blob_plain;hb=ref/heads/$CEPH_REF;f=src/test/pybind/test_rbd.py"
+relpath=$(dirname $0)/../../../src/test/pybind
 
 if [ -n "${VALGRIND}" ]; then
   valgrind --tool=${VALGRIND} --suppressions=${TESTDIR}/valgrind.supp \
-    nosetests -v test_rbd
+    nosetests -v $relpath/test_rbd
 else
-  nosetests -v test_rbd
+  nosetests -v $relpath/test_rbd
 fi
 exit 0

diff --git a/qa/workunits/rbd/test_lock_fence.sh b/qa/workunits/rbd/test_lock_fence.sh
index 7f664780573a353f9d9ae98264f862bef2b424c1..a688ea62d614bd78c999522b3f99479c134efd30 100755 (executable)
--- 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://git.ceph.com/?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