Skip to content

Commit

Permalink
teuthology-suite: add default machine type(smithi)
Browse files Browse the repository at this point in the history
right now the default_machine_type fallback is set to None via some internal
mangaling, this makes users always have to pass --machine_type which mostly we
prefer to smithi's . Hence, making it a default unless otherwise, should be
helpful for users.

Signed-off-by: Deepika Upadhyay <[email protected]>
  • Loading branch information
Deepika Upadhyay committed Mar 9, 2021
1 parent 17c0996 commit b07046c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
4 changes: 2 additions & 2 deletions scripts/suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

doc = """
usage: teuthology-suite --help
teuthology-suite [-v | -vv ] --machine-type <type> --suite <suite> [options] [<config_yaml>...]
teuthology-suite [-v | -vv ] --machine-type <type> --rerun <name> [options] [<config_yaml>...]
teuthology-suite [-v | -vv ] --suite <suite> [options] [<config_yaml>...]
teuthology-suite [-v | -vv ] --rerun <name> [options] [<config_yaml>...]
Run a suite of ceph integration tests. A suite is a directory containing
facets. A facet is a directory containing config snippets. Running a suite
Expand Down
1 change: 1 addition & 0 deletions teuthology/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ class TeuthologyConfig(YamlConfig):
'archive_upload_key': None,
'archive_upload_url': None,
'automated_scheduling': False,
'default_machine_type': 'smithi',
'reserve_machines': 5,
'ceph_git_base_url': 'https://github.com/ceph/',
'ceph_git_url': None,
Expand Down
5 changes: 1 addition & 4 deletions teuthology/suite/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,7 @@ def main(args):
teuthology.log.setLevel(logging.DEBUG)

if not conf.machine_type or conf.machine_type == 'None':
schedule_fail("Must specify a machine_type")
elif 'multi' in conf.machine_type:
schedule_fail("'multi' is not a valid machine_type. " +
"Maybe you want 'plana,mira,burnupi' or similar")
conf.machine_type = config.default_machine_type

if conf.email:
config.results_email = conf.email
Expand Down

0 comments on commit b07046c

Please sign in to comment.