From 0aabafd65f02dee02d1998264951b69ea028a9e7 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Thu, 12 Jun 2014 12:45:22 -0500 Subject: [PATCH] 'and' is a thing Signed-off-by: Zack Cerza --- teuthology/suite.py | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/teuthology/suite.py b/teuthology/suite.py index af8aada922..900569c1cd 100644 --- a/teuthology/suite.py +++ b/teuthology/suite.py @@ -154,25 +154,22 @@ def schedule_suite(name, exclude_arch = parsed_yaml.get('exclude_arch') exclude_os_type = parsed_yaml.get('exclude_os_type') - if exclude_arch: - if exclude_arch == arch: - log.info('Skipping due to excluded_arch: %s facets %s', - exclude_arch, description) - continue - if exclude_os_type: - if exclude_os_type == os_type: - log.info('Skipping due to excluded_os_type: %s facets %s', - exclude_os_type, description) - continue + if exclude_arch and exclude_arch == arch: + log.info('Skipping due to excluded_arch: %s facets %s', + exclude_arch, description) + continue + if exclude_os_type and exclude_os_type == os_type: + log.info('Skipping due to excluded_os_type: %s facets %s', + exclude_os_type, description) + continue # We should not run multiple tests (changing distros) unless the # machine is a VPS. # Re-imaging baremetal is not yet supported. - if machine_type != 'vps': - if os_type and os_type != 'ubuntu': - log.info( - 'Skipping due to non-ubuntu on baremetal facets %s', - description) - continue + if machine_type != 'vps' and os_type and os_type != 'ubuntu': + log.info( + 'Skipping due to non-ubuntu on baremetal facets %s', + description) + continue log.info( 'Scheduling %s', description -- 2.39.5