From 4bc9f566d04886d7f7311205563070d8b6c709da Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 7 Jul 2017 14:55:53 -0400 Subject: qa/suites/rados/upgrade: upgrade client.0 node too Fixes: http://tracker.ceph.com/issues/20368 Signed-off-by: Sage Weil Signed-off-by: Nathan Cutler --- qa/suites/rados/upgrade/jewel-x-singleton/6-finish-upgrade.yaml | 2 ++ qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rbd-python.yaml | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3 From 98eda9a4dc56d5dd2af38d8e97b2cbeba43b6e87 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Sat, 8 Jul 2017 10:48:49 +0200 Subject: qa: workunit: handle repo ending in "/ceph-ci" If the repo ends in "/ceph-ci" it's the same as if it ended in "/ceph-ci.git" Before this change, the following command was broken if the workunit specified, e.g., "branch: jewel": teuthology-suite --ceph-repo https://github.com/ceph/ceph --ceph master --suite-repo https://github.com/ceph/ceph-ci --suite-branch wip-foo . . . Fixes: http://tracker.ceph.com/issues/20554 Signed-off-by: Nathan Cutler --- qa/tasks/workunit.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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, -- cgit v1.2.3