qa/workunits/rbd: use CEPH_BASE

Signed-off-by: Sage Weil <sage@redhat.com>
ceph · Dec 15, 2016 · e39935d · e39935d
1 parent 526a8c6
commit e39935d
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 21 deletions.
diff --git a/qa/workunits/rbd/notify_master.sh b/qa/workunits/rbd/notify_master.sh
@@ -1,7 +1,6 @@
 #!/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"
+cp $CEPH_BASE/src/test/librbd/test_notify.py .
 
 python test_notify.py master
 exit 0
diff --git a/qa/workunits/rbd/notify_slave.sh b/qa/workunits/rbd/notify_slave.sh
@@ -1,7 +1,6 @@
 #!/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"
+cp $CEPH_BASE/src/test/librbd/test_notify.py .
 
 python test_notify.py slave
 exit 0
diff --git 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
+. ./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
@@ -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
+. ./rbd_mirror_helpers.sh
 
 create_snap()
 {

diff --git a/qa/workunits/rbd/test_librbd_python.sh b/qa/workunits/rbd/test_librbd_python.sh
@@ -1,9 +1,6 @@
 #!/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"
+cp $CEPH_BASE/src/test/pybind/test_rbd.py .
 
 if [ -n "${VALGRIND}" ]; then
   valgrind --tool=${VALGRIND} --suppressions=${TESTDIR}/valgrind.supp \

diff --git a/qa/workunits/rbd/test_lock_fence.sh b/qa/workunits/rbd/test_lock_fence.sh
@@ -6,7 +6,7 @@ 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"
+cp $CEPH_BASE/src/test/librbd/rbdrw.py .
 
 rbd create $IMAGE --size 10 --image-format 2 --image-shared || exit 1