From 8071609c2e2538ef3d2de92fe02d5b3536f724cc Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Thu, 30 May 2024 11:21:20 -0400 Subject: [PATCH] teuthology/suite: use valid subset default for rerun without --subset Fixes: https://tracker.ceph.com/issues/66302 Signed-off-by: Patrick Donnelly --- teuthology/suite/__init__.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/teuthology/suite/__init__.py b/teuthology/suite/__init__.py index 1967618fa..6fc167fab 100644 --- a/teuthology/suite/__init__.py +++ b/teuthology/suite/__init__.py @@ -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: -- 2.47.3