diff options
| author | Sage Weil <sage@newdream.net> | 2017-07-09 04:32:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-09 04:32:36 +0200 |
| commit | 0c79c4ffacde610a7754889a735a3e5582a57d1b (patch) | |
| tree | ceb0cd46fe82128b06771e855e7fa10322f56f4d | |
| parent | Merge pull request #15973 from majianpeng/bluefs-async-compact-log (diff) | |
| parent | qa: workunit: handle repo ending in "/ceph-ci" (diff) | |
| download | ceph-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>
| -rw-r--r-- | qa/suites/rados/upgrade/jewel-x-singleton/6-finish-upgrade.yaml | 2 | ||||
| -rw-r--r-- | qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rbd-python.yaml | 1 | ||||
| -rw-r--r-- | qa/tasks/workunit.py | 8 |
3 files changed, 8 insertions, 3 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 diff --git a/qa/tasks/workunit.py b/qa/tasks/workunit.py index 888b75eefff..ffd8b220284 100644 --- a/qa/tasks/workunit.py +++ b/qa/tasks/workunit.py @@ -4,6 +4,7 @@ Workunit task -- Run ceph on sets of specific clients import logging import pipes import os +import re from copy import deepcopy from util import get_remote_for_role @@ -377,9 +378,12 @@ def _run_tests(ctx, refspec, role, tests, env, subdir=None, timeout=None): remote.run(logger=log.getChild(role), args=refspec.clone(git_url, clonedir)) except CommandFailedError: - if not git_url.endswith('/ceph-ci.git'): + if git_url.endswith('/ceph-ci.git'): + alt_git_url = git_url.replace('/ceph-ci.git', '/ceph.git') + elif git_url.endswith('/ceph-ci'): + alt_git_url = re.sub(r'/ceph-ci$', '/ceph.git', git_url) + else: raise - alt_git_url = git_url.replace('/ceph-ci.git', '/ceph.git') log.info( "failed to check out '%s' from %s; will also try in %s", refspec, |