From: Sage Weil <sage@inktank.com>
Date: Fri, 23 Aug 2013 05:18:55 +0000 (-0700)
Subject: suite: only skip on non-vps if os-type is actually defined
X-Git-Tag: 1.1.0~1945
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f8f4c2d0e4858bbfb36ef15c8d5365539fb63c7a;p=teuthology.git

suite: only skip on non-vps if os-type is actually defined

If it's not defined, as it is (not) with most of the nightlies,
proceed!

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/teuthology/suite.py b/teuthology/suite.py
index 9825dcf1..bc30e4f8 100644
--- a/teuthology/suite.py
+++ b/teuthology/suite.py
@@ -157,7 +157,7 @@ combination, and will override anything in the suite.
             # 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 != 'ubuntu':
+                if os_type and os_type != 'ubuntu':
                     log.info(
                         'Skipping due to non-ubuntu on baremetal facets %s', description
                          )