From: Zack Cerza Date: Wed, 31 Jan 2024 01:04:01 +0000 (-0700) Subject: supervisor: Disregard nuke-on-error when unlocking X-Git-Tag: 1.2.0~56^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2a87d27979c88feed5c10e81113278aaf21d18a0;p=teuthology.git supervisor: Disregard nuke-on-error when unlocking Signed-off-by: Zack Cerza --- diff --git a/teuthology/dispatcher/supervisor.py b/teuthology/dispatcher/supervisor.py index bb3885d74..22304926f 100644 --- 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: