tests: subst repo and branch in qemu test urls

References: http://tracker.ceph.com/issues/18440
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 2484a5546160560a4050d35400a6edce37ae48ad)

diff --git a/qa/suites/rbd/maintenance/qemu/xfstests.yaml b/qa/suites/rbd/maintenance/qemu/xfstests.yaml
index 91ae52860c9a2113db845eb91adf3f3b1cd5578d..bd0f3e44de0a7d425b46d0b285dc56cb91f8b9e4 100644 (file)
--- a/qa/suites/rbd/maintenance/qemu/xfstests.yaml
+++ b/qa/suites/rbd/maintenance/qemu/xfstests.yaml
@@ -9,5 +9,5 @@ io_workload:
           clone: true
           type: block
           num_rbd: 2
-          test: http://git.ceph.com/?p=ceph.git;a=blob_plain;f=qa/run_xfstests_qemu.sh
+          test: http://git.ceph.com/?p={repo};a=blob_plain;hb={branch};f=qa/run_xfstests_qemu.sh
 exclude_arch: armv7l

diff --git a/qa/suites/rbd/qemu/workloads/#qemu_xfstests.yaml# b/qa/suites/rbd/qemu/workloads/#qemu_xfstests.yaml#
index a0857f9682d2a4cfc38372b59790c2ad6a57fbb2..75fc8236ad89304c41ab4d9008aec1d8c8fe465e 100644 (file)
--- a/qa/suites/rbd/qemu/workloads/#qemu_xfstests.yaml#
+++ b/qa/suites/rbd/qemu/workloads/#qemu_xfstests.yaml#
@@ -3,5 +3,5 @@ tasks:
     all:
       type: block
       num_rbd: 2
-      grtest: http://git.ceph.com/?p=ceph.git;a=blob_plain;f=qa/run_xfstests_qemu.sh
+      grtest: http://git.ceph.com/?p={repo};a=blob_plain;hb={branch};f=qa/run_xfstests_qemu.sh
 exclude_arch: armv7l

diff --git a/qa/suites/rbd/qemu/workloads/qemu_bonnie.yaml b/qa/suites/rbd/qemu/workloads/qemu_bonnie.yaml
index 3e523d61b776b26cd47251bc737140be16f15dbc..e06a5870e8e8b20220d1ac6e527ab0b9c280b8c2 100644 (file)
--- a/qa/suites/rbd/qemu/workloads/qemu_bonnie.yaml
+++ b/qa/suites/rbd/qemu/workloads/qemu_bonnie.yaml
@@ -2,5 +2,5 @@ tasks:
 - qemu:
     all:
       clone: true
-      test: http://git.ceph.com/?p=ceph.git;a=blob_plain;f=qa/workunits/suites/bonnie.sh
+      test: http://git.ceph.com/?p={repo};a=blob_plain;hb={branch};f=qa/workunits/suites/bonnie.sh
 exclude_arch: armv7l

diff --git a/qa/suites/rbd/qemu/workloads/qemu_fsstress.yaml b/qa/suites/rbd/qemu/workloads/qemu_fsstress.yaml
index 040dc5567b772646957f5802e995d5a54e750a70..a78801df25bc8eee92142ba679c872ec7997cb1c 100644 (file)
--- a/qa/suites/rbd/qemu/workloads/qemu_fsstress.yaml
+++ b/qa/suites/rbd/qemu/workloads/qemu_fsstress.yaml
@@ -2,5 +2,5 @@ tasks:
 - qemu:
     all:
       clone: true
-      test: http://git.ceph.com/?p=ceph.git;a=blob_plain;f=qa/workunits/suites/fsstress.sh
+      test: http://git.ceph.com/?p={repo};a=blob_plain;hb={branch};f=qa/workunits/suites/fsstress.sh
 exclude_arch: armv7l

diff --git a/qa/suites/rbd/qemu/workloads/qemu_iozone.yaml.disabled b/qa/suites/rbd/qemu/workloads/qemu_iozone.yaml.disabled
index 3dae6e78a2fe0b5628b6d8e0532e3d566d71c667..c436ba1f6dc84ee7a0a9e1c87a6ef884a6334ca7 100644 (file)
--- a/qa/suites/rbd/qemu/workloads/qemu_iozone.yaml.disabled
+++ b/qa/suites/rbd/qemu/workloads/qemu_iozone.yaml.disabled
@@ -1,6 +1,6 @@
 tasks:
 - qemu:
     all:
-      test: http://git.ceph.com/?p=ceph.git;a=blob_plain;f=qa/workunits/suites/iozone.sh
+      test: http://git.ceph.com/?p={repo};a=blob_plain;h={branch};f=qa/workunits/suites/iozone.sh
       image_size: 20480
 exclude_arch: armv7l

diff --git a/qa/suites/rbd/qemu/workloads/qemu_xfstests.yaml b/qa/suites/rbd/qemu/workloads/qemu_xfstests.yaml
index b6112d1bb2715ad09b7f97911b9e533301866bcb..670fd5f159a40c51099ebe4cd219a0d808a6f632 100644 (file)
--- a/qa/suites/rbd/qemu/workloads/qemu_xfstests.yaml
+++ b/qa/suites/rbd/qemu/workloads/qemu_xfstests.yaml
@@ -4,5 +4,5 @@ tasks:
       clone: true
       type: block
       num_rbd: 2
-      test: http://git.ceph.com/?p=ceph.git;a=blob_plain;f=qa/run_xfstests_qemu.sh
+      test: http://git.ceph.com/?p={repo};a=blob_plain;hb={branch};f=qa/run_xfstests_qemu.sh
 exclude_arch: armv7l