Helper scripts live in /usr/local/bin now!

diff --git a/teuthology/misc.py b/teuthology/misc.py
index dce2e1000eb4f1e76bc089f9b750c440d4ad2c4f..38bc7ca0c696a9829b320259840737d680755476 100644 (file)
--- 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 01c873c84b87b17f724e8efb21159cc746627223..dbb7a17cefcc5b599735bdfbe02b679cbae9b058 100644 (file)
--- 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 3b9a7acd3cecf57d83fafd5fa87ad3126071cf0f..bfe05f4235ca9a578aaf98b7ed7449cccbad199e 100644 (file)
--- 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 b0a0fe38bf38f1b5ea27a57a0364278de407ff18..66eb42863c289f1de3aaeed99d8a5899e226961d 100644 (file)
--- 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 d0cbbb5fe9e9e0e26a72df669b15c1b18f1b3e09..e2ee59dcaf02e579889b06e511eeb7d680f2e196 100644 (file)
--- 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 9cf68a2474ca50dc2e242f9988604f8257a7eaec..fda9d8f3ca1716f7c9b8bc1762ae5e006e054f27 100644 (file)
--- 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 628982d8f68ab88a6a5fd1632422e831acf94e0c..64358d5105e88170fee9142065caa286e0e0b58a 100644 (file)
--- 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 6fec64618d52b0eb8cb4c3c65674ebfbe90a6868..9fcec524d9cd98718222bb9788f9eb065c0cdf45 100644 (file)
--- 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 f9817313c867eaaa2cacdf463e31051124076753..eb5f54702db84bf072a30797f5279f69d85efdd6 100644 (file)
--- 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 748b9980684facdf1bbccef90f8548fb3a7bc0c1..cf76950eb5f33e4cf34cd1dadce9f24544d45b84 100644 (file)
--- 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 28433026cea7911491ddce2653d1ba79305d774b..e69884876cb97ed510361615dd767b459b04dca5 100644 (file)
--- 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 92e5af90c50750e94747ad6162305515f5e33bde..15ae7b54252513cf07346dd888204ea10821803f 100644 (file)
--- 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 d813a6782b34af1e9fde41f4a09e4b0a40cd9bd4..f6d4225da2fb6fb4d0d48fc42c57e4e963f8f89f 100644 (file)
--- 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 f69e851ae26c424d7ac7794a8164a413ff2fe1fc..45685015288d49ce41b01945e1d3fe35280bd6cf 100644 (file)
--- 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 7bef3e02caca0f14b01d26082ed77673beeb5a16..20715cf39a2566871b2c9e637aa342ca5e0ba356 100644 (file)
--- 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 4c57a00fe92ffea990c7a183d178e93844ac29f3..25b04a37db7c8fcf3db25e17e48fe3c114188f02 100644 (file)
--- 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 17c206161c030d5aa3fff7bcf89f049a528fc391..d50e94e692448b6b7d0856a5c1ae21b508b20be0 100644 (file)
--- 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 6e1bd71aed2942329dcaa8e81af3c1e5a9e2cb74..6f3cbd84bc5c8f475068175dc3f3591d8d323583 100644 (file)
--- 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 d841c2ecd3976cf642c77b2cfcfed638ccd83e2c..97d2850877290235cdadb77e1bc6cd6f203e9777 100644 (file)
--- 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 9026716bc4967f0c6db45b990067cb358a910b6f..569bba84ca6594f7156cd4d8afbb55cfbc446575 100644 (file)
--- 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 252d050bb7184738b40e99be1cd598be6df2e00e..817add29f04a4d4ce5f6c80b7bc3f7d1c38b80f7 100644 (file)
--- 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 6d31ee93e3ad89af3f130dd1887b45e35d4df4c8..ee90fb20c16f2c1d1fe72f2695546886119707cf 100644 (file)
--- 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 82cac99fa08529f071c2c85c114a0595034ddee1..54848b27bee4b8afcdae8586a78f80504537705e 100644 (file)
--- 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 b2ad6f9a00db26ea8097108b7328d32f231d9449..6583caafffd587b3e274e54c61f02e46673b8ae4 100644 (file)
--- 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 100d5ef388948de2f45a9042fa3014ed9eb004be..c99aeacd7c80aa9a8f5d5e46a8395bc7cc1f320e 100644 (file)
--- 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 a176367b059fd20233775c547b6f6b103b81f342..5109cf58e992dc4b0fe0164ac397c317e883facf 100644 (file)
--- 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 ea32c377972d77ab27edbaa4a225e859065cc4f6..b6281b9617c118ce2d611e5c3929e01eb0b9dc99 100644 (file)
--- 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 8a0f343420b1191e201f4cf4ef4e6979692775ab..90c5901d7295c7136b9def7534d52e890622b508 100644 (file)
--- 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 7a21ad5fbc6375c3984af43a2880627e1ec1372c..78c5c85ce15109c9a3c7df30295043dd01e2df67 100644 (file)
--- 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 ddba6a88be7a6ac86bcc8b13a5d43be4a72b56bd..e84efb22215d3704a3c208a8904b7f83ddd6a5a9 100644 (file)
--- 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 a9386c75b495083558b8aa3d87e7ae68c20775ca..1ce4cefd71e250ee8b510a108dd22f3e17ddab37 100644 (file)
--- 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 058292596e2e4fce3b4300de3224b2c203c5f044..82c387fd7ace26d2b8354d79c803e9e3b28db862 100644 (file)
--- 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),