From 53b8e27da996f2efdcc4eb687f3bda0791a8d947 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Fri, 6 Sep 2013 15:08:01 -0500 Subject: [PATCH] Helper scripts live in /usr/local/bin now! --- teuthology/misc.py | 16 ++++++++-------- teuthology/task/admin_socket.py | 2 +- teuthology/task/blktrace.py | 2 +- teuthology/task/ceph-fuse.py | 4 ++-- teuthology/task/ceph_client.py | 2 +- teuthology/task/ceph_manager.py | 8 ++++---- teuthology/task/cram.py | 2 +- teuthology/task/kclient.py | 2 +- teuthology/task/kcon_most.py | 4 ++-- teuthology/task/lockfile.py | 4 ++-- teuthology/task/osd_backfill.py | 2 +- teuthology/task/osd_failsafe_enospc.py | 10 +++++----- teuthology/task/osd_recovery.py | 2 +- teuthology/task/qemu.py | 4 ++-- teuthology/task/rados.py | 2 +- teuthology/task/radosgw-admin-rest.py | 2 +- teuthology/task/radosgw-agent.py | 2 +- teuthology/task/rbd.py | 10 +++++----- teuthology/task/rbd_fsx.py | 2 +- teuthology/task/recovery_bench.py | 6 +++--- teuthology/task/rest-api.py | 4 ++-- teuthology/task/restart.py | 2 +- teuthology/task/rgw.py | 8 ++++---- teuthology/task/s3readwrite.py | 4 ++-- teuthology/task/s3roundtrip.py | 4 ++-- teuthology/task/s3tests.py | 4 ++-- teuthology/task/samba.py | 2 +- teuthology/task/swift.py | 4 ++-- teuthology/task/watch_notify_stress.py | 2 +- teuthology/task/workunit.py | 2 +- teuthology/task_util/rados.py | 2 +- teuthology/task_util/rgw.py | 2 +- 32 files changed, 64 insertions(+), 64 deletions(-) diff --git a/teuthology/misc.py b/teuthology/misc.py index dce2e1000eb4f..38bc7ca0c696a 100644 --- a/teuthology/misc.py +++ b/teuthology/misc.py @@ -291,7 +291,7 @@ def create_simple_monmap(ctx, remote, conf): testdir = get_testdir(ctx) args = [ - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'monmaptool', @@ -664,7 +664,7 @@ def wait_until_healthy(ctx, remote): while True: r = remote.run( args=[ - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'ceph', @@ -686,7 +686,7 @@ def wait_until_osds_up(ctx, cluster, remote): while True: r = remote.run( args=[ - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'ceph', @@ -775,7 +775,7 @@ def write_secret_file(ctx, remote, role, keyring, filename): testdir = get_testdir(ctx) remote.run( args=[ - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'ceph-authtool', @@ -870,17 +870,17 @@ def get_valgrind_args(testdir, name, v): val_path = '/var/log/ceph/valgrind'.format(tdir=testdir) if '--tool=memcheck' in v or '--tool=helgrind' in v: extra_args = [ - '{tdir}/chdir-coredump'.format(tdir=testdir), + 'chdir-coredump', 'valgrind', - '--suppressions={tdir}/valgrind.supp'.format(tdir=testdir), + '--suppressions=valgrind.supp', '--xml=yes', '--xml-file={vdir}/{n}.log'.format(vdir=val_path, n=name) ] else: extra_args = [ - '{tdir}/chdir-coredump'.format(tdir=testdir), + 'chdir-coredump', 'valgrind', - '--suppressions={tdir}/valgrind.supp'.format(tdir=testdir), + '--suppressions=valgrind.supp', '--log-file={vdir}/{n}.log'.format(vdir=val_path, n=name) ] extra_args.extend(v) diff --git a/teuthology/task/admin_socket.py b/teuthology/task/admin_socket.py index 01c873c84b87b..dbb7a17cefcc5 100644 --- a/teuthology/task/admin_socket.py +++ b/teuthology/task/admin_socket.py @@ -74,7 +74,7 @@ def _socket_command(ctx, remote, socket_path, command, args): proc = remote.run( args=[ 'sudo', - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'ceph', diff --git a/teuthology/task/blktrace.py b/teuthology/task/blktrace.py index 3b9a7acd3cecf..bfe05f4235ca9 100644 --- a/teuthology/task/blktrace.py +++ b/teuthology/task/blktrace.py @@ -41,7 +41,7 @@ def execute(ctx, config): 'cd', log_dir, run.Raw(';'), - '{tdir}/daemon-helper'.format(tdir=testdir), + 'daemon-helper', daemon_signal, 'sudo', blktrace, diff --git a/teuthology/task/ceph-fuse.py b/teuthology/task/ceph-fuse.py index b0a0fe38bf38f..66eb42863c289 100644 --- a/teuthology/task/ceph-fuse.py +++ b/teuthology/task/ceph-fuse.py @@ -82,10 +82,10 @@ def task(ctx, config): run_cmd=[ 'sudo', - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), - '{tdir}/daemon-helper'.format(tdir=testdir), + 'daemon-helper', daemon_signal, ] run_cmd_tail=[ diff --git a/teuthology/task/ceph_client.py b/teuthology/task/ceph_client.py index d0cbbb5fe9e9e..e2ee59dcaf02e 100644 --- a/teuthology/task/ceph_client.py +++ b/teuthology/task/ceph_client.py @@ -16,7 +16,7 @@ def create_keyring(ctx): remote.run( args=[ 'sudo', - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', coverage_dir, 'ceph-authtool', diff --git a/teuthology/task/ceph_manager.py b/teuthology/task/ceph_manager.py index 9cf68a2474ca5..fda9d8f3ca171 100644 --- a/teuthology/task/ceph_manager.py +++ b/teuthology/task/ceph_manager.py @@ -324,7 +324,7 @@ class CephManager: def raw_cluster_cmd(self, *args): testdir = teuthology.get_testdir(self.ctx) ceph_args = [ - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'ceph', @@ -339,7 +339,7 @@ class CephManager: def raw_cluster_cmd_result(self, *args): testdir = teuthology.get_testdir(self.ctx) ceph_args = [ - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'ceph', @@ -354,7 +354,7 @@ class CephManager: def do_rados(self, remote, cmd): testdir = teuthology.get_testdir(self.ctx) pre = [ - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'rados', @@ -412,7 +412,7 @@ class CephManager: assert remote is not None args=[ 'sudo', - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'ceph', diff --git a/teuthology/task/cram.py b/teuthology/task/cram.py index 628982d8f68ab..64358d5105e88 100644 --- a/teuthology/task/cram.py +++ b/teuthology/task/cram.py @@ -112,7 +112,7 @@ def _run_tests(ctx, role): args=[ run.Raw('CEPH_REF={ref}'.format(ref=ceph_ref)), run.Raw('CEPH_ID="{id}"'.format(id=id_)), - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), '{tdir}/virtualenv/bin/cram'.format(tdir=testdir), diff --git a/teuthology/task/kclient.py b/teuthology/task/kclient.py index 6fec64618d52b..9fcec524d9cd9 100644 --- a/teuthology/task/kclient.py +++ b/teuthology/task/kclient.py @@ -69,7 +69,7 @@ def task(ctx, config): remote.run( args=[ 'sudo', - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), '/sbin/mount.ceph', diff --git a/teuthology/task/kcon_most.py b/teuthology/task/kcon_most.py index f9817313c867e..eb5f54702db84 100644 --- a/teuthology/task/kcon_most.py +++ b/teuthology/task/kcon_most.py @@ -44,7 +44,7 @@ def task(ctx, config): remote.run( args=[ 'sudo', - '{tdir}/kcon_most'.format(tdir=testdir), + 'kcon_most', 'on' ], ) @@ -58,7 +58,7 @@ def task(ctx, config): remote.run( args=[ 'sudo', - '{tdir}/kcon_most'.format(tdir=testdir), + 'kcon_most', 'off' ], ) diff --git a/teuthology/task/lockfile.py b/teuthology/task/lockfile.py index 748b9980684fa..cf76950eb5f33 100644 --- a/teuthology/task/lockfile.py +++ b/teuthology/task/lockfile.py @@ -192,10 +192,10 @@ def lock_one(op, ctx): try: proc = client_remote.run( args=[ - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), - '{tdir}/daemon-helper'.format(tdir=testdir), + 'daemon-helper', 'kill', '{tdir}/lockfile/sclockandhold'.format(tdir=testdir), filepath, diff --git a/teuthology/task/osd_backfill.py b/teuthology/task/osd_backfill.py index 28433026cea79..e69884876cb97 100644 --- a/teuthology/task/osd_backfill.py +++ b/teuthology/task/osd_backfill.py @@ -11,7 +11,7 @@ def rados_start(ctx, remote, cmd): log.info("rados %s" % ' '.join(cmd)) testdir = teuthology.get_testdir(ctx) pre = [ - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'rados', diff --git a/teuthology/task/osd_failsafe_enospc.py b/teuthology/task/osd_failsafe_enospc.py index 92e5af90c5075..15ae7b5425251 100644 --- a/teuthology/task/osd_failsafe_enospc.py +++ b/teuthology/task/osd_failsafe_enospc.py @@ -60,7 +60,7 @@ def task(ctx, config): proc = mon.run( args=[ - '{tdir}/daemon-helper'.format(tdir=teuthology.get_testdir(ctx)), + 'daemon-helper', 'kill', 'ceph', '-w' ], @@ -87,7 +87,7 @@ def task(ctx, config): proc = mon.run( args=[ - '{tdir}/daemon-helper'.format(tdir=teuthology.get_testdir(ctx)), + 'daemon-helper', 'kill', 'ceph', '-w' ], @@ -128,7 +128,7 @@ def task(ctx, config): proc = mon.run( args=[ - '{tdir}/daemon-helper'.format(tdir=teuthology.get_testdir(ctx)), + 'daemon-helper', 'kill', 'ceph', '-w' ], @@ -156,7 +156,7 @@ def task(ctx, config): proc = mon.run( args=[ - '{tdir}/daemon-helper'.format(tdir=teuthology.get_testdir(ctx)), + 'daemon-helper', 'kill', 'ceph', '-w' ], @@ -186,7 +186,7 @@ def task(ctx, config): proc = mon.run( args=[ - '{tdir}/daemon-helper'.format(tdir=teuthology.get_testdir(ctx)), + 'daemon-helper', 'kill', 'ceph', '-w' ], diff --git a/teuthology/task/osd_recovery.py b/teuthology/task/osd_recovery.py index d813a6782b34a..f6d4225da2fb6 100644 --- a/teuthology/task/osd_recovery.py +++ b/teuthology/task/osd_recovery.py @@ -10,7 +10,7 @@ log = logging.getLogger(__name__) def rados_start(testdir, remote, cmd): log.info("rados %s" % ' '.join(cmd)) pre = [ - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'rados', diff --git a/teuthology/task/qemu.py b/teuthology/task/qemu.py index f69e851ae26c4..45685015288d4 100644 --- a/teuthology/task/qemu.py +++ b/teuthology/task/qemu.py @@ -162,10 +162,10 @@ def run_qemu(ctx, config): base_file = '{tdir}/qemu/base.{client}.qcow2'.format(tdir=testdir, client=client) args=[ - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), - '{tdir}/daemon-helper'.format(tdir=testdir), + 'daemon-helper', 'term', 'kvm', '-enable-kvm', '-nographic', '-m', str(client_config.get('memory', DEFAULT_MEM)), diff --git a/teuthology/task/rados.py b/teuthology/task/rados.py index 7bef3e02caca0..20715cf39a256 100644 --- a/teuthology/task/rados.py +++ b/teuthology/task/rados.py @@ -57,7 +57,7 @@ def task(ctx, config): op_weights = config.get('op_weights', {}) testdir = teuthology.get_testdir(ctx) args = [ - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'ceph_test_rados', diff --git a/teuthology/task/radosgw-admin-rest.py b/teuthology/task/radosgw-admin-rest.py index 4c57a00fe92ff..25b04a37db7c8 100644 --- a/teuthology/task/radosgw-admin-rest.py +++ b/teuthology/task/radosgw-admin-rest.py @@ -31,7 +31,7 @@ def rgwadmin(ctx, client, cmd): log.info('radosgw-admin: %s' % cmd) testdir = teuthology.get_testdir(ctx) pre = [ - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'radosgw-admin', diff --git a/teuthology/task/radosgw-agent.py b/teuthology/task/radosgw-agent.py index 17c206161c030..d50e94e692448 100644 --- a/teuthology/task/radosgw-agent.py +++ b/teuthology/task/radosgw-agent.py @@ -74,7 +74,7 @@ def run_radosgw_agent(ctx, config): port = cconf.get('port', 8000) daemon_name = '{host}.{port}.syncdaemon'.format(host=remote.name, port=port) in_args=[ - '{tdir}/daemon-helper'.format(tdir=testdir), 'kill', + 'daemon-helper', '{tdir}/radosgw-agent.{client}/radosgw-agent'.format(tdir=testdir, client=client), '-v', diff --git a/teuthology/task/rbd.py b/teuthology/task/rbd.py index 6e1bd71aed294..6f3cbd84bc5c8 100644 --- a/teuthology/task/rbd.py +++ b/teuthology/task/rbd.py @@ -54,7 +54,7 @@ def create_image(ctx, config): log.info('Creating image {name} with size {size}'.format(name=name, size=size)) args = [ - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage'.format(tdir=testdir), '{tdir}/archive/coverage'.format(tdir=testdir), 'rbd', @@ -79,7 +79,7 @@ def create_image(ctx, config): (remote,) = ctx.cluster.only(role).remotes.keys() remote.run( args=[ - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'rbd', @@ -166,7 +166,7 @@ def dev_create(ctx, config): remote.run( args=[ 'sudo', - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'rbd', @@ -193,7 +193,7 @@ def dev_create(ctx, config): args=[ 'LD_LIBRARY_PATH={tdir}/binary/usr/local/lib'.format(tdir=testdir), 'sudo', - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'rbd', @@ -419,7 +419,7 @@ def run_xfstests_one_client(ctx, role, properties): # pathname (so it matches what the kernel remembers). args = [ '/usr/bin/sudo', - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'TESTDIR={tdir}'.format(tdir=testdir), diff --git a/teuthology/task/rbd_fsx.py b/teuthology/task/rbd_fsx.py index d841c2ecd3976..97d2850877290 100644 --- a/teuthology/task/rbd_fsx.py +++ b/teuthology/task/rbd_fsx.py @@ -42,7 +42,7 @@ def _run_one_client(ctx, config, role): (remote,) = ctx.cluster.only(role).remotes.iterkeys() remote.run( args=[ - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'ceph_test_librbd_fsx', diff --git a/teuthology/task/recovery_bench.py b/teuthology/task/recovery_bench.py index 9026716bc4967..569bba84ca659 100644 --- a/teuthology/task/recovery_bench.py +++ b/teuthology/task/recovery_bench.py @@ -104,7 +104,7 @@ class RecoveryBencher: # create the objects osd_remote.run( args=[ - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'smalliobench'.format(tdir=testdir), @@ -120,7 +120,7 @@ class RecoveryBencher: log.info('non-recovery (baseline)') p = osd_remote.run( args=[ - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'smalliobench', @@ -142,7 +142,7 @@ class RecoveryBencher: log.info('recovery active') p = osd_remote.run( args=[ - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'smalliobench', diff --git a/teuthology/task/rest-api.py b/teuthology/task/rest-api.py index 252d050bb7184..817add29f04a4 100644 --- a/teuthology/task/rest-api.py +++ b/teuthology/task/rest-api.py @@ -21,7 +21,7 @@ def run_rest_api_daemon(ctx, api_clients): id_ = whole_id_[len('clients'):] run_cmd = [ 'sudo', - '{tdir}/daemon-helper'.format(tdir=testdir), + 'daemon-helper', 'kill', 'ceph-rest-api', '-n', @@ -98,7 +98,7 @@ def task(ctx, config): rems.run( args=[ 'sudo', - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', coverage_dir, 'ceph-authtool', diff --git a/teuthology/task/restart.py b/teuthology/task/restart.py index 6d31ee93e3ad8..ee90fb20c16f2 100644 --- a/teuthology/task/restart.py +++ b/teuthology/task/restart.py @@ -111,7 +111,7 @@ def task(ctx, config): env_arg = '{var}={val}'.format(var=var, val=quoted_val) args.append(run.Raw(env_arg)) args.extend([ - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), '{srcdir}/{c}'.format( diff --git a/teuthology/task/rgw.py b/teuthology/task/rgw.py index 82cac99fa0852..54848b27bee4b 100644 --- a/teuthology/task/rgw.py +++ b/teuthology/task/rgw.py @@ -146,10 +146,10 @@ def start_rgw(ctx, config): log.info('client {client} is id {id}'.format(client=client, id=id_)) run_cmd=[ 'sudo', - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), - '{tdir}/daemon-helper'.format(tdir=testdir), + 'daemon-helper', 'term', ] run_cmd_tail=[ @@ -224,8 +224,8 @@ def start_apache(ctx, config): apache_name = '/usr/sbin/httpd' proc = remote.run( args=[ - '{tdir}/adjust-ulimits'.format(tdir=testdir), - '{tdir}/daemon-helper'.format(tdir=testdir), + 'adjust-ulimits', + 'daemon-helper', 'kill', apache_name, '-X', diff --git a/teuthology/task/s3readwrite.py b/teuthology/task/s3readwrite.py index b2ad6f9a00db2..6583caafffd58 100644 --- a/teuthology/task/s3readwrite.py +++ b/teuthology/task/s3readwrite.py @@ -103,7 +103,7 @@ def create_users(ctx, config): else: ctx.cluster.only(client).run( args=[ - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'radosgw-admin', @@ -126,7 +126,7 @@ def create_users(ctx, config): if delete_this_user: ctx.cluster.only(client).run( args=[ - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'radosgw-admin', diff --git a/teuthology/task/s3roundtrip.py b/teuthology/task/s3roundtrip.py index 100d5ef388948..c99aeacd7c80a 100644 --- a/teuthology/task/s3roundtrip.py +++ b/teuthology/task/s3roundtrip.py @@ -71,7 +71,7 @@ def create_users(ctx, config): _config_user(s3tests_conf, section, '{user}.{client}'.format(user=user, client=client)) ctx.cluster.only(client).run( args=[ - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'radosgw-admin', @@ -92,7 +92,7 @@ def create_users(ctx, config): uid = '{user}.{client}'.format(user=user, client=client) ctx.cluster.only(client).run( args=[ - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'radosgw-admin', diff --git a/teuthology/task/s3tests.py b/teuthology/task/s3tests.py index a176367b059fd..5109cf58e992d 100644 --- a/teuthology/task/s3tests.py +++ b/teuthology/task/s3tests.py @@ -162,7 +162,7 @@ def create_users(ctx, config): log.debug('Creating user {user} on {host}'.format(user=s3tests_conf[section]['user_id'],host=client)) ctx.cluster.only(client).run( args=[ - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'radosgw-admin', @@ -183,7 +183,7 @@ def create_users(ctx, config): uid = '{user}.{client}'.format(user=user, client=client) ctx.cluster.only(client).run( args=[ - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'radosgw-admin', diff --git a/teuthology/task/samba.py b/teuthology/task/samba.py index ea32c377972d7..b6281b9617c11 100644 --- a/teuthology/task/samba.py +++ b/teuthology/task/samba.py @@ -148,7 +148,7 @@ def task(ctx, config): smbd_cmd = [ 'sudo', - '{tdir}/daemon-helper'.format(tdir=testdir), + 'daemon-helper', 'kill', 'nostdin', '/usr/local/samba/sbin/smbd', diff --git a/teuthology/task/swift.py b/teuthology/task/swift.py index 8a0f343420b11..90c5901d7295c 100644 --- a/teuthology/task/swift.py +++ b/teuthology/task/swift.py @@ -59,7 +59,7 @@ def create_users(ctx, config): _config_user(testswift_conf, '{user}.{client}'.format(user=user, client=client), user, suffix) ctx.cluster.only(client).run( args=[ - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'radosgw-admin', @@ -80,7 +80,7 @@ def create_users(ctx, config): uid = '{user}.{client}'.format(user=user, client=client) ctx.cluster.only(client).run( args=[ - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'radosgw-admin', diff --git a/teuthology/task/watch_notify_stress.py b/teuthology/task/watch_notify_stress.py index 7a21ad5fbc637..78c5c85ce1510 100644 --- a/teuthology/task/watch_notify_stress.py +++ b/teuthology/task/watch_notify_stress.py @@ -44,7 +44,7 @@ def task(ctx, config): args =['CEPH_CLIENT_ID={id_}'.format(id_=id_), 'CEPH_ARGS="{flags}"'.format(flags=config.get('flags', '')), - '{tdir}/daemon-helper'.format(tdir=testdir), 'kill', + 'daemon-helper', 'multi_stress_watch foo foo' ] diff --git a/teuthology/task/workunit.py b/teuthology/task/workunit.py index ddba6a88be7a6..e84efb22215d3 100644 --- a/teuthology/task/workunit.py +++ b/teuthology/task/workunit.py @@ -287,7 +287,7 @@ def _run_tests(ctx, refspec, role, tests, env, subdir=None): env_arg = '{var}={val}'.format(var=var, val=quoted_val) args.append(run.Raw(env_arg)) args.extend([ - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), '{srcdir}/{workunit}'.format( diff --git a/teuthology/task_util/rados.py b/teuthology/task_util/rados.py index a9386c75b4950..1ce4cefd71e25 100644 --- a/teuthology/task_util/rados.py +++ b/teuthology/task_util/rados.py @@ -8,7 +8,7 @@ def rados(ctx, remote, cmd, wait=True, check_status=False): testdir = teuthology.get_testdir(ctx) log.info("rados %s" % ' '.join(cmd)) pre = [ - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'rados', diff --git a/teuthology/task_util/rgw.py b/teuthology/task_util/rgw.py index 058292596e2e4..82c387fd7ace2 100644 --- a/teuthology/task_util/rgw.py +++ b/teuthology/task_util/rgw.py @@ -19,7 +19,7 @@ def rgwadmin(ctx, client, cmd, stdin=StringIO(), check_status=False): log.info('rgwadmin: {client} : {cmd}'.format(client=client,cmd=cmd)) testdir = teuthology.get_testdir(ctx) pre = [ - '{tdir}/adjust-ulimits'.format(tdir=testdir), + 'adjust-ulimits', 'ceph-coverage'.format(tdir=testdir), '{tdir}/archive/coverage'.format(tdir=testdir), 'radosgw-admin'.format(tdir=testdir), -- 2.39.5