]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
workunit: use passed refspec rather than checking sha1 again
authorSamuel Just <sam.just@inktank.com>
Sun, 28 Apr 2013 19:15:42 +0000 (12:15 -0700)
committerSamuel Just <sam.just@inktank.com>
Sun, 28 Apr 2013 19:27:52 +0000 (12:27 -0700)
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
teuthology/task/workunit.py

index d7f4aca04d5396ac951a5363c8cf23e69ea79da4..b077fafb3b2b25ee9337e93c6d1c3e608dfce764 100644 (file)
@@ -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)),