]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
Merge pull request #54 from ceph/sentry
authorAlfredo Deza <alfredo@deza.pe>
Wed, 28 Aug 2013 16:38:20 +0000 (09:38 -0700)
committerAlfredo Deza <alfredo@deza.pe>
Wed, 28 Aug 2013 16:38:20 +0000 (09:38 -0700)
Add logs and Sentry events to suite emails

1  2 
teuthology/suite.py

index e8df8619e7c957fa32dbaf1c04a2183d0291d5c6,1a3e13b229fa58203319aaec6315dd1c28afede5..087df2de595a4f583fa5c94360fc7772a62e33e0
@@@ -460,24 -559,22 +561,26 @@@ def get_exclude_arch(configs)
      for config in configs:
          yamlfile = config[2]
          y = yaml.safe_load(file(yamlfile))
 -        os_type = y.get('exclude_arch')
 -        if os_type:
 -            return os_type
 +        if not y:
 +            y = {}
 +        exclude_arch = y.get('exclude_arch')
 +        if exclude_arch:
 +            return exclude_arch
      return None
  
  def get_exclude_os_type(configs):
      for config in configs:
          yamlfile = config[2]
          y = yaml.safe_load(file(yamlfile))
 -        os_type = y.get('exclude_os_type')
 -        if os_type:
 -            return os_type
 +        if not y:
 +            y = {}
 +        exclude_os_type = y.get('exclude_os_type')
 +        if exclude_os_type:
 +            return exclude_os_type
      return None
  
  def get_machine_type(config):
      for yamlfile in config:
          y = yaml.safe_load(file(yamlfile))