Fixup latest commits that use /tmp/cephtest.

Signed-off-by: Sam Lang <sam.lang@inktank.com>

diff --git a/teuthology/task/ceph_manager.py b/teuthology/task/ceph_manager.py
index 341b4ae6ac983335dfc0ec0cdd34fc54b5691ab5..36b50c72c880c2c073fc9222a7f0b6e6d07c1497 100644 (file)
--- a/teuthology/task/ceph_manager.py
+++ b/teuthology/task/ceph_manager.py
@@ -247,13 +247,14 @@ class CephManager:
         return proc.stdout.getvalue()
 
     def do_rados(self, remote, cmd):
+        testdir = teuthology.get_testdir(self.ctx)
         pre = [
-            'LD_LIBRARY_PATH=/tmp/cephtest/binary/usr/local/lib',
-            '/tmp/cephtest/enable-coredump',
-            '/tmp/cephtest/binary/usr/local/bin/ceph-coverage',
-            '/tmp/cephtest/archive/coverage',
-            '/tmp/cephtest/binary/usr/local/bin/rados',
-            '-c', '/tmp/cephtest/ceph.conf',
+            'LD_LIBRARY_PATH={tdir}/binary/usr/local/lib'.format(tdir=testdir),
+            '{tdir}/enable-coredump'.format(tdir=testdir),
+            '{tdir}/binary/usr/local/bin/ceph-coverage'.format(tdir=testdir),
+            '{tdir}/archive/coverage'.format(tdir=testdir),
+            '{tdir}/binary/usr/local/bin/rados'.format(tdir=testdir),
+            '-c', '{tdir}/ceph.conf'.format(tdir=testdir),
             ];
         pre.extend(cmd)
         proc = remote.run(
@@ -263,6 +264,7 @@ class CephManager:
         return proc
 
     def osd_admin_socket(self, osdnum, command, check_status=True):
+        testdir = teuthology.get_testdir(self.ctx)
         remote = None
         for _remote, roles_for_host in self.ctx.cluster.remotes.iteritems():
             for id_ in teuthology.roles_of_type(roles_for_host, 'osd'):
@@ -270,15 +272,15 @@ class CephManager:
                     remote = _remote
         assert remote is not None
         args=[
-                'LD_LIBRARY_PRELOAD=/tmp/cephtest/binary/usr/local/lib',
-                '/tmp/cephtest/enable-coredump',
-                '/tmp/cephtest/binary/usr/local/bin/ceph-coverage',
-                '/tmp/cephtest/archive/coverage',
-                '/tmp/cephtest/binary/usr/local/bin/ceph',
-                '-k', '/tmp/cephtest/ceph.keyring',
-                '-c', '/tmp/cephtest/ceph.conf',
+                'LD_LIBRARY_PRELOAD={tdir}/binary/usr/local/lib'.format(tdir=testdir),
+                '{tdir}/enable-coredump'.format(tdir=testdir),
+                '{tdir}/binary/usr/local/bin/ceph-coverage'.format(tdir=testdir),
+                '{tdir}/archive/coverage'.format(tdir=testdir),
+                '{tdir}/binary/usr/local/bin/ceph'.format(tdir=testdir),
+                '-k', '{tdir}/ceph.keyring'.format(tdir=testdir),
+                '-c', '{tdir}/ceph.conf'.format(tdir=testdir),
                 '--admin-daemon',
-                "/tmp/cephtest/asok.osd.%s"%(str(osdnum),)]
+                "%s/asok.osd.%s"%(testdir,str(osdnum),)]
         args.extend(command)
         return remote.run(
             args=args,

diff --git a/teuthology/task/workunit.py b/teuthology/task/workunit.py
index c4b5067fd2a95a2b52e79a47eb1a961275c93a40..e5873cec164f33192be449a082ba3322fe526461 100644 (file)
--- a/teuthology/task/workunit.py
+++ b/teuthology/task/workunit.py
@@ -104,9 +104,10 @@ def task(ctx, config):
 
 def _delete_dir(ctx, role, subdir):
     PREFIX = 'client.'
+    testdir = teuthology.get_testdir(ctx)
     id_ = role[len(PREFIX):]
     (remote,) = ctx.cluster.only(role).remotes.iterkeys()
-    mnt = os.path.join('/tmp/cephtest', 'mnt.{id}'.format(id=id_))
+    mnt = os.path.join(testdir, 'mnt.{id}'.format(id=id_))
     client = os.path.join(mnt, 'client.{id}'.format(id=id_))
     try:
         remote.run(