Get rid of chdir-coredump.

diff --git a/teuthology/misc.py b/teuthology/misc.py
index 2a69b8698123a4c57255a6a896280cd01ce01fb9..0d217dbbeae6cfe465c7fae51749a5e59b7ecdbe 100644 (file)
--- a/teuthology/misc.py
+++ b/teuthology/misc.py
@@ -870,7 +870,8 @@ 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 = [
-            'chdir-coredump',
+            'cd', testdir,
+            run.Raw('&&'),
             'valgrind',
             '--num-callers=50',
             '--suppressions=valgrind.supp',
@@ -879,7 +880,8 @@ def get_valgrind_args(testdir, name, v):
             ]
     else:
         extra_args = [
-            'chdir-coredump',
+            'cd', testdir,
+            run.Raw('&&'),
             'valgrind',
             '--suppressions=valgrind.supp',
             '--log-file={vdir}/{n}.log'.format(vdir=val_path, n=name)

diff --git a/teuthology/task/ceph.py b/teuthology/task/ceph.py
index 6852a514335f664e818ca6076454873e1ee9a0ba..498e78d3474411d79f8b522fc4fa53b65776cf5f 100644 (file)
--- a/teuthology/task/ceph.py
+++ b/teuthology/task/ceph.py
@@ -149,8 +149,7 @@ def ceph_log(ctx, config):
 @contextlib.contextmanager
 def ship_utilities(ctx, config):
     assert config is None
-    FILES = ['daemon-helper', 'adjust-ulimits', 'chdir-coredump',
-             'valgrind.supp', 'kcon_most']
+    FILES = ['daemon-helper', 'adjust-ulimits', 'valgrind.supp', 'kcon_most']
     destdir = '/usr/local/bin'
     for filename in FILES:
         log.info('Shipping %r...', filename)

diff --git a/teuthology/task/chdir-coredump b/teuthology/task/chdir-coredump
deleted file mode 100644 (file)
index 9c0b458..0000000
--- a/teuthology/task/chdir-coredump
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-set -e
-
-testdir=$(readlink -e $(dirname $0))
-# valgrind only dumps to cwd, so cwd there...
-cd ${testdir}/archive/coredump
-
-exec "$@"