summaryrefslogtreecommitdiffstats
path: root/qa/suites/rados
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2017-07-09 04:32:36 +0200
committerGitHub <noreply@github.com>2017-07-09 04:32:36 +0200
commit0c79c4ffacde610a7754889a735a3e5582a57d1b (patch)
treeceb0cd46fe82128b06771e855e7fa10322f56f4d /qa/suites/rados
parentMerge pull request #15973 from majianpeng/bluefs-async-compact-log (diff)
parentqa: workunit: handle repo ending in "/ceph-ci" (diff)
downloadceph-0c79c4ffacde610a7754889a735a3e5582a57d1b.tar.xz
ceph-0c79c4ffacde610a7754889a735a3e5582a57d1b.zip
Merge pull request #16228 from smithfarm/wip-rados-upgrade-2
tests: fix rados/upgrade/jewel-x-singleton and make workunit task handle repo URLs not ending in ".git" Reviewed-by: Sage Weil <sage@redhat.com>
Diffstat (limited to 'qa/suites/rados')
-rw-r--r--qa/suites/rados/upgrade/jewel-x-singleton/6-finish-upgrade.yaml2
-rw-r--r--qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rbd-python.yaml1
2 files changed, 2 insertions, 1 deletions
diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/6-finish-upgrade.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/6-finish-upgrade.yaml
index 8dff3458933..d4c69463c97 100644
--- a/qa/suites/rados/upgrade/jewel-x-singleton/6-finish-upgrade.yaml
+++ b/qa/suites/rados/upgrade/jewel-x-singleton/6-finish-upgrade.yaml
@@ -13,3 +13,5 @@ tasks:
daemons: [mds.a]
wait-for-up: true
wait-for-healthy: false
+- install.upgrade:
+ client.0:
diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rbd-python.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rbd-python.yaml
index 8da34579c81..56ba21d7a18 100644
--- a/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rbd-python.yaml
+++ b/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rbd-python.yaml
@@ -3,7 +3,6 @@ meta:
librbd python api tests
tasks:
- workunit:
- branch: jewel
clients:
client.0:
- rbd/test_librbd_python.sh