supervisor: Disregard nuke-on-error when unlocking

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/teuthology/dispatcher/supervisor.py b/teuthology/dispatcher/supervisor.py
index bb3885d74389788e4c4b213c8a43a3ef1642aca1..22304926f88950946fa73d8223d8b6c9cabe5376 100644 (file)
--- a/teuthology/dispatcher/supervisor.py
+++ b/teuthology/dispatcher/supervisor.py
@@ -272,8 +272,7 @@ def unlock_targets(job_config):
     if not locked:
         return
     job_status = get_status(job_info)
-    if job_status == 'pass' or (job_config.get('unlock_on_failure', False)
-                                and not job_config.get('nuke-on-error', False)):
+    if job_status == 'pass' or job_config.get('unlock_on_failure', False):
         log.info('Unlocking machines...')
         fake_ctx = create_fake_context(job_config)
         for machine in locked: