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.

Sign up for GitHub

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: add default machine type(smithi) #1625

Merged
merged 1 commit into from
May 27, 2021
Merged

teuthology-suite: add default machine type(smithi) #1625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions scripts/suite.py
View file
Open in desktop
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
7 changes: 5 additions & 2 deletions teuthology/suite/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,13 @@ 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")
if not config.default_machine_type or config.default_machine_type == 'None':
schedule_fail("Must specify a machine_type")
else:
conf.machine_type = config.default_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")
"Maybe you want 'gibba,smithi,mira' or similar")

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