Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

supervisor: Disregard nuke-on-error when unlocking #1914

Merged
merged 2 commits into from
Jan 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions teuthology/dispatcher/supervisor.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 0 additions & 9 deletions teuthology/test/test_exit.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import os
import random
import signal

from unittest.mock import patch, Mock

from teuthology import exit
from teuthology.test import skipif_teuthology_process


class TestExiter(object):
Expand Down Expand Up @@ -40,13 +38,6 @@ def teardown_method(self):
self.patcher_kill.stop()
del self.m_kill

@skipif_teuthology_process
def test_noop(self):
sig = 15
obj = self.klass()
assert len(obj.handlers) == 0
assert signal.getsignal(sig) == 0

def test_basic(self):
sig = 15
obj = self.klass()
Expand Down
Loading