From: Sage Weil Date: Wed, 13 Nov 2019 23:10:38 +0000 (+0000) Subject: qa/suites/rados/ssh: new tests! X-Git-Tag: v15.1.0~790^2~5 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3d9686405ca1c5cc532082641dd1882958f49773;p=ceph.git qa/suites/rados/ssh: new tests! Signed-off-by: Sage Weil --- diff --git a/qa/suites/rados/ssh/% b/qa/suites/rados/ssh/% new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/qa/suites/rados/ssh/.qa b/qa/suites/rados/ssh/.qa new file mode 120000 index 000000000000..fea2489fdf6d --- /dev/null +++ b/qa/suites/rados/ssh/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/rados/ssh/fixed-2.yaml b/qa/suites/rados/ssh/fixed-2.yaml new file mode 120000 index 000000000000..230ff0fdab41 --- /dev/null +++ b/qa/suites/rados/ssh/fixed-2.yaml @@ -0,0 +1 @@ +.qa/clusters/fixed-2.yaml \ No newline at end of file diff --git a/qa/suites/rados/ssh/msgr b/qa/suites/rados/ssh/msgr new file mode 120000 index 000000000000..57bee80db00a --- /dev/null +++ b/qa/suites/rados/ssh/msgr @@ -0,0 +1 @@ +.qa/msgr \ No newline at end of file diff --git a/qa/suites/rados/ssh/start.yaml b/qa/suites/rados/ssh/start.yaml new file mode 100644 index 000000000000..d43d570915f8 --- /dev/null +++ b/qa/suites/rados/ssh/start.yaml @@ -0,0 +1,3 @@ +tasks: +- install: +- ceph2: diff --git a/qa/suites/rados/ssh/supported-random-distro$ b/qa/suites/rados/ssh/supported-random-distro$ new file mode 120000 index 000000000000..0862b4457b37 --- /dev/null +++ b/qa/suites/rados/ssh/supported-random-distro$ @@ -0,0 +1 @@ +.qa/distros/supported-random-distro$ \ No newline at end of file diff --git a/qa/suites/rados/ssh/tasks/rados_api_tests.yaml b/qa/suites/rados/ssh/tasks/rados_api_tests.yaml new file mode 120000 index 000000000000..72299dabbf27 --- /dev/null +++ b/qa/suites/rados/ssh/tasks/rados_api_tests.yaml @@ -0,0 +1 @@ +../../basic/tasks/rados_api_tests.yaml \ No newline at end of file diff --git a/qa/suites/rados/ssh/tasks/rados_python.yaml b/qa/suites/rados/ssh/tasks/rados_python.yaml new file mode 120000 index 000000000000..f989c79b3ac8 --- /dev/null +++ b/qa/suites/rados/ssh/tasks/rados_python.yaml @@ -0,0 +1 @@ +../../basic/tasks/rados_python.yaml \ No newline at end of file diff --git a/qa/tasks/ceph2.py b/qa/tasks/ceph2.py index d9df71c5af35..9a4fe61ea3e0 100644 --- a/qa/tasks/ceph2.py +++ b/qa/tasks/ceph2.py @@ -421,7 +421,21 @@ def ceph_mons(ctx, config): break time.sleep(1) - ## FIXME: refresh ceph.conf files for all mons + first mgr ## + # refresh ceph.conf files for all mons + first mgr + """ + for remote, roles in ctx.cluster.remotes.items(): + for mon in [r for r in roles + if teuthology.is_type('mon', cluster_name)(r)]: + c_, _, id_ = teuthology.split_role(mon) + shell(ctx, cluster_name, remote, [ + 'ceph', 'orchestrator', 'service', 'redeploy', + 'mon', id_, + ]) + shell(ctx, cluster_name, ctx.ceph[cluster_name].bootstrap_remote, [ + 'ceph', 'orchestrator', 'service', 'redeploy', + 'mgr', ctx.ceph[cluster_name].first_mgr, + ]) + """ yield