From: Loic Dachary <loic@dachary.org>
Date: Tue, 13 Aug 2013 10:43:21 +0000 (+0200)
Subject: do not check the jobid if check-locks is False
X-Git-Tag: 1.1.0~1984^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9d4104f45b355f12bb75f6bf253fa113f71fb49b;p=teuthology.git

do not check the jobid if check-locks is False

Because it relies on the lock server which is presumably not available
since check-locks was set to False. It matters when using teuthology
on a minimal installation.

http://tracker.ceph.com/issues/5946 fixes #5946

Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/teuthology/misc.py b/teuthology/misc.py
index 33bdc4ec0..958cb64ea 100644
--- a/teuthology/misc.py
+++ b/teuthology/misc.py
@@ -36,7 +36,7 @@ def get_testdir(ctx):
 
     # check if a jobid exists in the machine status for all our targets
     # and if its the same jobid, use that as the subdir for the test
-    if not checked_jobid:
+    if not checked_jobid and ctx.config.get('check-locks') != False:
         jobids = {}
         for machine in ctx.config['targets'].iterkeys():
             status = lockstatus.get_status(ctx, machine)