From: Samuel Just Date: Sun, 28 Apr 2013 19:15:42 +0000 (-0700) Subject: workunit: use passed refspec rather than checking sha1 again X-Git-Tag: 1.1.0~2167^2~12 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=45df0b264edfefd25bb9fba02a6d9fc066e71bcb;p=teuthology.git workunit: use passed refspec rather than checking sha1 again Signed-off-by: Samuel Just Reviewed-by: Josh Durgin --- diff --git a/teuthology/task/workunit.py b/teuthology/task/workunit.py index d7f4aca04..b077fafb3 100644 --- a/teuthology/task/workunit.py +++ b/teuthology/task/workunit.py @@ -232,8 +232,6 @@ def _run_tests(ctx, refspec, role, tests, env, subdir=None): scratch_tmp = os.path.join(mnt, subdir) srcdir = '{tdir}/workunit.{role}'.format(tdir=testdir, role=role) - ceph_ref = ctx.summary.get('ceph-sha1', 'master') - remote.run( logger=log.getChild(role), args=[ @@ -278,7 +276,7 @@ def _run_tests(ctx, refspec, role, tests, env, subdir=None): run.Raw('&&'), 'cd', '--', scratch_tmp, run.Raw('&&'), - run.Raw('CEPH_REF={ref}'.format(ref=ceph_ref)), + 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)),