From: Ali Maredia Date: Wed, 22 Nov 2023 15:57:41 +0000 (-0500) Subject: qa: remove vstart runner from radosgw_admin task X-Git-Tag: v17.2.8~584^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e99283173aeaf081d90159c3054577d19e85e38e;p=ceph.git qa: remove vstart runner from radosgw_admin task Fixes: https://tracker.ceph.com/issues/63583 Signed-off-by: Ali Maredia (cherry picked from commit a44fd94b9681441a3251d0988d1ddd159f3733f8) --- diff --git a/qa/tasks/radosgw_admin.py b/qa/tasks/radosgw_admin.py index 780dae1e15a6d..28d58715facac 100644 --- a/qa/tasks/radosgw_admin.py +++ b/qa/tasks/radosgw_admin.py @@ -7,8 +7,9 @@ Rgw admin testing against a running instance # grep '^ *# TESTCASE' | sed 's/^ *# TESTCASE //' # # to run this standalone: -# python qa/tasks/radosgw_admin.py [--user=uid] --host=host --port=port -# +# 1. uncomment vstart_runner lines to run locally against a vstart cluster +# 2. run: +# $ python qa/tasks/radosgw_admin.py [--user=uid] --host=host --port=port import json import logging @@ -27,7 +28,7 @@ import httplib2 #import pdb -import tasks.vstart_runner +#import tasks.vstart_runner from tasks.rgw import RGWEndpoint from tasks.util.rgw import rgwadmin as tasks_util_rgw_rgwadmin from tasks.util.rgw import get_user_summary, get_user_successful_ops @@ -1107,7 +1108,7 @@ def task(ctx, config): (err, out) = rgwadmin(ctx, client, ['zonegroup', 'get'], check_status=True) from teuthology.config import config -from teuthology.orchestra import cluster +from teuthology.orchestra import cluster, remote import argparse; @@ -1124,7 +1125,9 @@ def main(): else: port = 80 - client0 = tasks.vstart_runner.LocalRemote() + client0 = remote.Remote(host) + #client0 = tasks.vstart_runner.LocalRemote() + ctx = config ctx.cluster=cluster.Cluster(remotes=[(client0, [ 'ceph.client.rgw.%s' % (port), ]),])