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

teuthology/suite: use valid subset default for rerun without --subset #1951

Merged
merged 1 commit into from
May 31, 2024
Merged
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
15 changes: 12 additions & 3 deletions teuthology/suite/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,15 +160,24 @@ def get_rerun_conf_overrides(conf):
log.info('Using rerun seed=%s', seed)
conf.seed = seed

subset = None if job0 is None else tuple(map(int, job0.get('subset').split('/')))
if job0 is not None:
subset = job0.get('subset', '1/1')
if subset is None:
subset = '1/1'
subset = tuple(map(int, subset.split('/')))
else:
subset = None
if conf.subset is not None and conf.subset != subset:
log.error('--subset %s does not match with '
'rerun subset: %s',
conf.subset, subset)
sys.exit(1)
else:
log.info('Using rerun subset=%s', subset)
conf.subset = subset
if subset == (1, 1):
conf.subset = None
else:
log.info('Using rerun subset=%s', subset)
conf.subset = subset

no_nested_subset = False if job0 is None else job0.get('no_nested_subset', False)
if conf.no_nested_subset is not None and conf.no_nested_subset != no_nested_subset:
Expand Down
Loading