Bug 1253341 - Allow running talos on AWS machines r=kmoir
authorChris AtLee <catlee@mozilla.com>
Tue, 15 Mar 2016 15:16:15 -0400 (2016-03-15)
changeset 4788 ddb55938d8425c190114e9a7b8d878bf2ef9899d
parent 4784 046c46eb099d5cfc8816a8a11c0973837df5203d
child 4789 96061589c9f944d576c0eb3a06a256f34fe674f1
child 4790 139b15174c5db0c088d9300f8f387ec8d919fa89
push id4031
push usercatlee@mozilla.com
push dateFri, 18 Mar 2016 19:08:46 +0000 (2016-03-18)
reviewerskmoir
bugs1253341
Bug 1253341 - Allow running talos on AWS machines r=kmoir
misc.py
--- a/misc.py
+++ b/misc.py
@@ -2098,31 +2098,35 @@ def generateTalosBranchObjects(branch, b
 
         try_default = True
         if not branch_config['platforms'][platform].get('try_by_default', True):
             try_default = False
         elif not platform_config.get('try_by_default', True):
             try_default = False
 
         for slave_platform in set(slave_platforms + talos_slave_platforms):
+            if slave_platform not in platform_config:
+                continue
             platform_name = platform_config[slave_platform]['name']
             # this is to handle how a platform has more than one slave
             # platform
             slave_platform_try_default = try_default
             if not platform_config[slave_platform].get('try_by_default', True):
                 slave_platform_try_default = False
             platformPrettyName = platform_name
             if not slave_platform_try_default:
                 platformPrettyName += ' try-nondefault'
             prettyNames.setdefault(platform, []).append(platformPrettyName)
             for suite, talosConfig in SUITES.iteritems():
                 tests, merge, extra, platforms = branch_config[
                     '%s_tests' % suite]
-                if tests == 0 or slave_platform not in platforms:
+
+                if tests == 0 or slave_platform not in platforms or slave_platform not in talos_slave_platforms:
                     continue
+
                 assert tests == 1
 
                 skipconfig = None
                 if (slave_platform in branch_config['platforms'][platform] and
                    'skipconfig' in branch_config['platforms'][platform][slave_platform]):
                     skipconfig = branch_config['platforms'][platform][slave_platform]['skipconfig'].get(('talos', suite))
 
                 # We only want to append '-Non-PGO' to platforms that