From fa5c6250125a51e61e34aa9586cc917df7458138 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Sat, 7 Jan 2017 13:48:51 +0100 Subject: [PATCH] tests: subst repo and branch in qemu test urls References: http://tracker.ceph.com/issues/18440 Signed-off-by: Nathan Cutler (cherry picked from commit 2484a5546160560a4050d35400a6edce37ae48ad) Conflicts: (hammer doesn't have these files) qa/suites/rbd/maintenance/qemu/xfstests.yaml qa/suites/rbd/qemu/workloads/#qemu_xfstests.yaml# --- qa/suites/rbd/qemu/workloads/qemu_bonnie.yaml | 2 +- qa/suites/rbd/qemu/workloads/qemu_fsstress.yaml | 2 +- qa/suites/rbd/qemu/workloads/qemu_iozone.yaml.disabled | 2 +- qa/suites/rbd/qemu/workloads/qemu_xfstests.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qa/suites/rbd/qemu/workloads/qemu_bonnie.yaml b/qa/suites/rbd/qemu/workloads/qemu_bonnie.yaml index 3e523d61b776b..e06a5870e8e8b 100644 --- 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 040dc5567b772..a78801df25bc8 100644 --- 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 3dae6e78a2fe0..c436ba1f6dc84 100644 --- 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 b6112d1bb2715..670fd5f159a40 100644 --- 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 -- 2.39.5