From b6aeccaf15c939fd50e1de29d55391e608230e60 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Tue, 2 Feb 2021 14:57:34 -0500 Subject: [PATCH] dispatcher: keep operating if preparing a job fails prep_job() handles updating the job status already. Signed-off-by: Josh Durgin --- teuthology/dispatcher/__init__.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/teuthology/dispatcher/__init__.py b/teuthology/dispatcher/__init__.py index 0ea18521e4..f6eea469d9 100644 --- a/teuthology/dispatcher/__init__.py +++ b/teuthology/dispatcher/__init__.py @@ -10,6 +10,7 @@ from teuthology import setup_log_file, install_except_hook from teuthology import beanstalk from teuthology import report from teuthology.config import config as teuth_config +from teuthology.exceptions import SkipJob from teuthology.repo_utils import fetch_qa_suite, fetch_teuthology from teuthology.lock.ops import block_and_lock_machines from teuthology.dispatcher import supervisor @@ -117,11 +118,14 @@ def main(args): if job_config.get('stop_worker'): keep_running = False - job_config, teuth_bin_path = prep_job( - job_config, - log_file_path, - archive_dir, - ) + try: + job_config, teuth_bin_path = prep_job( + job_config, + log_file_path, + archive_dir, + ) + except SkipJob: + continue # lock machines but do not reimage them if 'roles' in job_config: -- 2.39.5