drop obsolete PYTHONPATH settings

These are left over from when we were extracting a tarball in the test dir.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/teuthology/task/cram.py b/teuthology/task/cram.py
index 4829b8edd1b13af96b20d546b2c9cc999b05ce6a..628982d8f68ab88a6a5fd1632422e831acf94e0c 100644 (file)
--- a/teuthology/task/cram.py
+++ b/teuthology/task/cram.py
@@ -112,7 +112,6 @@ def _run_tests(ctx, role):
         args=[
             run.Raw('CEPH_REF={ref}'.format(ref=ceph_ref)),
             run.Raw('CEPH_ID="{id}"'.format(id=id_)),
-            run.Raw('PYTHONPATH="$PYTHONPATH:{tdir}/binary/usr/local/lib/python2.7/dist-packages:{tdir}/binary/usr/local/lib/python2.6/dist-packages"'.format(tdir=testdir)),
             '{tdir}/adjust-ulimits'.format(tdir=testdir),
             'ceph-coverage',
             '{tdir}/archive/coverage'.format(tdir=testdir),

diff --git a/teuthology/task/restart.py b/teuthology/task/restart.py
index c06b76d28cab674db11db885a71dc2fa881ba446..6d31ee93e3ad89af3f130dd1887b45e35d4df4c8 100644 (file)
--- a/teuthology/task/restart.py
+++ b/teuthology/task/restart.py
@@ -103,7 +103,6 @@ def task(ctx, config):
                 log.info('Running restart script %s...', c)
                 args = [
                     run.Raw('TESTDIR="{tdir}"'.format(tdir=testdir)),
-                    run.Raw('PYTHONPATH="$PYTHONPATH:{tdir}/binary/usr/local/lib/python2.7/dist-packages:{tdir}/binary/usr/local/lib/python2.6/dist-packages"'.format(tdir=testdir)),
                     ]
                 env = config.get('env')
                 if env is not None:

diff --git a/teuthology/task/workunit.py b/teuthology/task/workunit.py
index b8268016dc7078c20ea3d0aa916f5c876073be12..ddba6a88be7a6ac86bcc8b13a5d43be4a72b56bd 100644 (file)
--- a/teuthology/task/workunit.py
+++ b/teuthology/task/workunit.py
@@ -280,7 +280,6 @@ def _run_tests(ctx, refspec, role, tests, env, subdir=None):
                     run.Raw('CEPH_REF={ref}'.format(ref=refspec)),
                     run.Raw('TESTDIR="{tdir}"'.format(tdir=testdir)),
                     run.Raw('CEPH_ID="{id}"'.format(id=id_)),
-                    run.Raw('PYTHONPATH="$PYTHONPATH:{tdir}/binary/usr/local/lib/python2.7/dist-packages:{tdir}/binary/usr/local/lib/python2.6/dist-packages"'.format(tdir=testdir)),
                     ]
                 if env is not None:
                     for var, val in env.iteritems():