Put sudo in front of adjust-ulimits if it's used

diff --git a/teuthology/task/ceph.py b/teuthology/task/ceph.py
index d89162618b8d99dc7590c95828cee8667499670a..6e3b08aed98c4e146b54177097cf24c1b54f3a55 100644 (file)
--- a/teuthology/task/ceph.py
+++ b/teuthology/task/ceph.py
@@ -507,10 +507,10 @@ def cluster(ctx, config):
                     '-p',
                     '/var/lib/ceph/mds/ceph-{id}'.format(id=id_),
                     run.Raw('&&'),
+                    'sudo',
                     '{tdir}/adjust-ulimits'.format(tdir=testdir),
                     'ceph-coverage',
                     coverage_dir,
-                    'sudo',
                     'ceph-authtool',
                     '--create-keyring',
                     '--gen-key',
@@ -610,11 +610,11 @@ def cluster(ctx, config):
         for id_ in teuthology.roles_of_type(roles_for_host, 'osd'):
             remote.run(
                 args=[
+                    'sudo',
                     'MALLOC_CHECK_=3',
                     '{tdir}/adjust-ulimits'.format(tdir=testdir),
                     'ceph-coverage',
                     coverage_dir,
-                    'sudo',
                     'ceph-osd',
                     '--mkfs',
                     '--mkkey',
@@ -695,10 +695,10 @@ def cluster(ctx, config):
                 )
             remote.run(
                 args=[
+                    'sudo',
                     '{tdir}/adjust-ulimits'.format(tdir=testdir),
                     'ceph-coverage',
                     coverage_dir,
-                    'sudo',
                     'ceph-mon',
                     '--mkfs',
                     '-i', id_,
@@ -874,10 +874,10 @@ def run_daemon(ctx, config, type_):
                 num_active += 1
 
             run_cmd = [
+                'sudo',
                 '{tdir}/adjust-ulimits'.format(tdir=testdir),
                 'ceph-coverage',
                 coverage_dir,
-                'sudo',
                 '{tdir}/daemon-helper'.format(tdir=testdir),
                 daemon_signal,
                 ]

diff --git a/teuthology/task/ceph_client.py b/teuthology/task/ceph_client.py
index fd4f8cb2efdb510ecd95f3993e375fc88b8d15f5..d0cbbb5fe9e9e0e26a72df669b15c1b18f1b3e09 100644 (file)
--- a/teuthology/task/ceph_client.py
+++ b/teuthology/task/ceph_client.py
@@ -15,10 +15,10 @@ def create_keyring(ctx):
             client_keyring = '/etc/ceph/ceph.client.{id}.keyring'.format(id=id_)
             remote.run(
                 args=[
+                    'sudo',
                     '{tdir}/adjust-ulimits'.format(tdir=testdir),
                     'ceph-coverage',
                     coverage_dir,
-                    'sudo',
                     'ceph-authtool',
                     '--create-keyring',
                     '--gen-key',

diff --git a/teuthology/task/rbd.py b/teuthology/task/rbd.py
index d107c6f473b8dcd66e1386bb6e72d23d2f1a2bd5..6e1bd71aed2942329dcaa8e81af3c1e5a9e2cb74 100644 (file)
--- a/teuthology/task/rbd.py
+++ b/teuthology/task/rbd.py
@@ -418,10 +418,10 @@ def run_xfstests_one_client(ctx, role, properties):
         # readlink -f <path> in order to get their canonical
         # pathname (so it matches what the kernel remembers).
         args = [
+            '/usr/bin/sudo',
             '{tdir}/adjust-ulimits'.format(tdir=testdir),
             'ceph-coverage',
             '{tdir}/archive/coverage'.format(tdir=testdir),
-            '/usr/bin/sudo',
             'TESTDIR={tdir}'.format(tdir=testdir),
             '/bin/bash',
             test_path,