Use mixins for GPU bot configurations.

Define and use mixins for the most common GPU bot configurations. To
avoid errors and differences between machines, in most of these mixins,
parameters like the OS have been flattened in.

Use these mixins on the chromium.gpu, chromium.gpu.fyi, and
client.v8.fyi waterfalls.

This CL is essentially a no-op; it only modifies a few timeouts due to
unification under the mixin "limited_capacity_bot".

Bug: 895815
Change-Id: Ia9da945d73720ea70ebb4983808eb23463ee1108
Reviewed-on: https://chromium-review.googlesource.com/c/1287431Reviewed-by: Stephen Martinis <martiniss@chromium.org>
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#601324}

testing/buildbot/chromium.gpu.fyi.json

@@ -4147,7 +4147,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800
+          "expiration": 21600
         },
         "test": "angle_unittests"
       },
@@ -4164,7 +4164,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800
+          "expiration": 21600
         },
         "test": "angle_white_box_tests"
       },
@@ -4186,7 +4186,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800
+          "expiration": 21600
         },
         "test": "browser_tests"
       },
@@ -4204,7 +4204,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800
+          "expiration": 21600
         },
         "test": "gl_tests"
       },
@@ -4221,7 +4221,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800
+          "expiration": 21600
         },
         "test": "gles2_conform_test"
       },
@@ -4235,7 +4235,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800
+          "expiration": 21600
         },
         "test": "swiftshader_unittests"
       }
@@ -4261,7 +4261,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800,
+          "expiration": 21600,
           "idempotent": false
         }
       },
@@ -4285,7 +4285,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800,
+          "expiration": 21600,
           "idempotent": false
         }
       },
@@ -4309,7 +4309,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800,
+          "expiration": 21600,
           "idempotent": false
         }
       },
@@ -4333,7 +4333,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800,
+          "expiration": 21600,
           "idempotent": false
         }
       },
@@ -4361,7 +4361,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800,
+          "expiration": 21600,
           "idempotent": false
         }
       },
@@ -4392,7 +4392,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800,
+          "expiration": 21600,
           "idempotent": false
         }
       },
@@ -4431,7 +4431,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800,
+          "expiration": 21600,
           "idempotent": false
         }
       },
@@ -4456,7 +4456,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800,
+          "expiration": 21600,
           "idempotent": false
         }
       },
@@ -4480,7 +4480,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800,
+          "expiration": 21600,
           "idempotent": false
         }
       },
@@ -4506,7 +4506,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800,
+          "expiration": 21600,
           "idempotent": false,
           "shards": 20
         }
@@ -4531,7 +4531,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800,
+          "expiration": 21600,
           "idempotent": false,
           "shards": 2
         }
@@ -4556,7 +4556,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800,
+          "expiration": 21600,
           "idempotent": false,
           "shards": 2
         }
@@ -11504,7 +11504,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800,
+          "expiration": 21600,
           "shards": 4
         },
         "test": "angle_end2end_tests"
@@ -11523,7 +11523,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800
+          "expiration": 21600
         },
         "test": "angle_unittests"
       },
@@ -11544,7 +11544,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800
+          "expiration": 21600
         },
         "test": "browser_tests"
       },
@@ -11562,7 +11562,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800
+          "expiration": 21600
         },
         "test": "gl_tests"
       },
@@ -11579,7 +11579,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800
+          "expiration": 21600
         },
         "test": "gl_unittests"
       },
@@ -11596,7 +11596,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800
+          "expiration": 21600
         },
         "test": "gles2_conform_test"
       },
@@ -11610,7 +11610,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800
+          "expiration": 21600
         },
         "test": "gpu_unittests"
       }
@@ -11636,7 +11636,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800,
+          "expiration": 21600,
           "idempotent": false
         }
       },
@@ -11660,7 +11660,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800,
+          "expiration": 21600,
           "idempotent": false
         }
       },
@@ -11684,7 +11684,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800,
+          "expiration": 21600,
           "idempotent": false
         }
       },
@@ -11708,7 +11708,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800,
+          "expiration": 21600,
           "idempotent": false
         }
       },
@@ -11736,7 +11736,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800,
+          "expiration": 21600,
           "idempotent": false
         }
       },
@@ -11767,7 +11767,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800,
+          "expiration": 21600,
           "idempotent": false
         }
       },
@@ -11806,7 +11806,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800,
+          "expiration": 21600,
           "idempotent": false
         }
       },
@@ -11831,7 +11831,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800,
+          "expiration": 21600,
           "idempotent": false
         }
       },
@@ -11855,7 +11855,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800,
+          "expiration": 21600,
           "idempotent": false
         }
       },
@@ -11881,7 +11881,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800,
+          "expiration": 21600,
           "idempotent": false,
           "shards": 20
         }
@@ -11906,7 +11906,7 @@
               "pool": "Chrome-GPU"
             }
           ],
-          "expiration": 10800,
+          "expiration": 21600,
           "idempotent": false,
           "shards": 2
         }

testing/buildbot/generate_buildbot_json.py

@@ -435,11 +435,13 @@ class BBJSONGenerator(object):
 
   def add_common_test_properties(self, test, tester_config):
     if tester_config.get('use_multi_dimension_trigger_script'):
+      # Assumes update_and_cleanup_test has already been called, so the
+      # builder's mixins have been flattened into the test.
       test['trigger_script'] = {
         'script': '//testing/trigger_scripts/trigger_multiple_dimensions.py',
         'args': [
           '--multiple-trigger-configs',
-          json.dumps(tester_config['swarming']['dimension_sets'] +
+          json.dumps(test['swarming']['dimension_sets'] +
                      tester_config.get('alternate_swarming_dimensions', [])),
           '--multiple-dimension-script-verbose',
           'True'

testing/buildbot/generate_buildbot_json_unittest.py

@@ -40,6 +40,19 @@ class FakeBBGen(generate_buildbot_json.BBJSONGenerator):
   def write_file(self, relative_path, contents):
     self.files[relative_path] = contents
 
+  # pragma pylint: disable=arguments-differ
+  def check_output_file_consistency(self, verbose=False, dump=True):
+    try:
+      super(FakeBBGen, self).check_output_file_consistency(verbose)
+    except generate_buildbot_json.BBGenErr:
+      if verbose and dump:
+          # Assume we want to see the difference in the waterfalls'
+          # generated output to make it easier to rebaseline the test.
+          for line in self.printed_lines:
+            print line
+      raise
+# pragma pylint: enable=arguments-differ
+
 
 FOO_GTESTS_WATERFALL = """\
 [
@@ -1366,7 +1379,8 @@ MULTI_DIMENSION_OUTPUT = """\
         "trigger_script": {
           "args": [
             "--multiple-trigger-configs",
-            "[{\\"gpu\\": \\"none\\", \\"os\\": \\"1\\"}, \
+            "[{\\"gpu\\": \\"none\\", \\"integrity\\": \\"high\\", \
+\\"os\\": \\"1\\"}, \
 {\\"gpu\\": \\"none\\", \\"os\\": \\"2\\"}]",
             "--multiple-dimension-script-verbose",
             "True"
@@ -2145,7 +2159,7 @@ class UnitTest(unittest.TestCase):
     fbb.files['chromium.test.json'] = (
       '\n' + COMPOSITION_WATERFALL_FILTERED_OUTPUT)
     with self.assertRaises(generate_buildbot_json.BBGenErr):
-      fbb.check_output_file_consistency(verbose=True)
+      fbb.check_output_file_consistency(verbose=True, dump=False)
     joined_lines = ' '.join(fbb.printed_lines)
     self.assertRegexpMatches(
         joined_lines, 'Waterfall chromium.test did not have the following'

testing/buildbot/mixins.pyl

@@ -120,6 +120,15 @@
       },
     },
   },
+  'angler': {
+    # Nexus 6P
+    'swarming': {
+      'dimensions': {
+        'device_type': 'angler',
+        'os': 'Android',
+      },
+    },
+  },
   'arm_tester': {
     'swarming': {
       'dimensions': {
@@ -135,6 +144,24 @@
       },
     },
   },
+  'flounder': {
+    # Nexus 9
+    'swarming': {
+      'dimensions': {
+        'device_type': 'flounder',
+        'os': 'Android',
+      },
+    },
+  },
+  'foster': {
+    # NVIDIA SHIELD TV
+    'swarming': {
+      'dimensions': {
+        'device_type': 'foster',
+        'os': 'Android',
+      },
+    },
+  },
   'gpu_pool': {
     'swarming': {
       'dimensions': {
@@ -143,6 +170,7 @@
     },
   },
   'hammerhead': {
+    # Nexus 5
     'swarming': {
       'dimensions': {
         'device_type': 'hammerhead',
@@ -184,6 +212,49 @@
       },
     },
   },
+  'linux_amd_r7_240': {
+    'swarming': {
+      'dimensions': {
+        'gpu': '1002:6613',
+        'os': 'Ubuntu',
+        'pool': 'Chrome-GPU',
+      },
+    },
+  },
+  'linux_intel_hd_530': {
+    'swarming': {
+      'dimensions': {
+        'gpu': '8086:1912',
+        'os': 'Ubuntu',
+        'pool': 'Chrome-GPU',
+      }
+    }
+  },
+  'linux_intel_hd_630': {
+    'swarming': {
+      'dimensions': {
+        'gpu': '8086:5912',
+        'os': 'Ubuntu',
+        'pool': 'Chrome-GPU',
+      }
+    }
+  },
+  'linux_nvidia_quadro_p400': {
+    'swarming': {
+      'dimensions': {
+        'gpu': '10de:1cb3-384.90',
+        'os': 'Ubuntu',
+        'pool': 'Chrome-GPU',
+      }
+    }
+  },
+  'lollipop': {
+    'swarming': {
+      'dimensions': {
+        'device_os': 'L',
+      },
+    },
+  },
   'mac-rel-args': {
     'args': [
       'mac-release/sizes',
@@ -225,6 +296,83 @@
       },
     },
   },
+  'mac_mini_intel_gpu': {
+    'swarming': {
+      'dimensions': {
+        'gpu': '8086:0a2e',
+        'os': 'Mac-10.12.6',
+      },
+    },
+  },
+  'mac_mini_intel_gpu_experimental': {
+    'swarming': {
+      'dimensions': {
+        'gpu': '8086:0a2e',
+        'os': 'Mac-10.13.6',
+        'pool': 'Chrome-GPU',
+      },
+    },
+  },
+  'mac_pro_amd_gpu': {
+    'swarming': {
+      'dimensions': {
+        'gpu': '1002:679e',
+        'os': 'Mac-10.12',
+        'pool': 'Chrome-GPU',
+      },
+    },
+  },
+  'mac_retina_amd_gpu': {
+    'swarming': {
+      'dimensions': {
+        'gpu': '1002:6821',
+        'hidpi': '1',
+        'os': 'Mac-10.13.6',
+        'pool': 'Chrome-GPU',
+      },
+    },
+  },
+  'mac_retina_amd_gpu_experimental': {
+    # Currently same configuration as stable version above.
+    'swarming': {
+      'dimensions': {
+        'gpu': '1002:6821',
+        'hidpi': '1',
+        'os': 'Mac-10.13.6',
+        'pool': 'Chrome-GPU',
+      },
+    },
+  },
+  'mac_retina_nvidia_gpu': {
+    'swarming': {
+      'dimensions': {
+        'gpu': '10de:0fe9',
+        'hidpi': '1',
+        'os': 'Mac-10.13.6',
+        'pool': 'Chrome-GPU',
+      },
+    },
+  },
+  'mac_retina_nvidia_gpu_experimental': {
+    # Currently the same as the stable version.
+    'swarming': {
+      'dimensions': {
+        'gpu': '10de:0fe9',
+        'hidpi': '1',
+        'os': 'Mac-10.13.6',
+        'pool': 'Chrome-GPU',
+      },
+    },
+  },
+  'marlin': {
+    # Pixel XL
+    'swarming': {
+      'dimensions': {
+        'device_type': 'marlin',
+        'os': 'Android',
+      },
+    },
+  },
   'marshmallow': {
     'swarming': {
       'dimensions': {
@@ -232,6 +380,13 @@
       },
     },
   },
+  'marshmallow_generic': {
+    'swarming': {
+      'dimensions': {
+        'device_os': 'M',
+      },
+    },
+  },
   'no_gpu': {
     'swarming': {
       'dimensions': {
@@ -239,6 +394,13 @@
       },
     },
   },
+  'nougat': {
+    'swarming': {
+      'dimensions': {
+        'device_os': 'N',
+      },
+    },
+  },
   'nvidia_750m_mac_edition': {
     'swarming': {
       'dimensions': {
@@ -246,6 +408,38 @@
       },
     },
   },
+  'oreo': {
+    'swarming': {
+      'dimensions': {
+        'device_os': 'O',
+      },
+    },
+  },
+  'pie': {
+    'swarming': {
+      'dimensions': {
+        'device_os': 'P',
+      },
+    },
+  },
+  'shamu': {
+    # Nexus 6
+    'swarming': {
+      'dimensions': {
+        'device_type': 'shamu',
+        'os': 'Android',
+      },
+    },
+  },
+  'walleye': {
+    # Pixel 2
+    'swarming': {
+      'dimensions': {
+        'device_type': 'walleye',
+        'os': 'Android',
+      },
+    },
+  },
   'win10': {
     'swarming': {
       'dimensions': {
@@ -253,6 +447,44 @@
       },
     },
   },
+  'win10_intel_hd_630_experimental': {
+    # Currently same as stable version.
+    'swarming': {
+      'dimensions': {
+        'gpu': '8086:5912-24.20.100.6286',
+        'os': 'Windows-10',
+        'pool': 'Chrome-GPU',
+      },
+    },
+  },
+  'win10_intel_hd_630_stable': {
+    'swarming': {
+      'dimensions': {
+        'gpu': '8086:5912-24.20.100.6286',
+        'os': 'Windows-10',
+        'pool': 'Chrome-GPU',
+      },
+    },
+  },
+  'win10_nvidia_quadro_p400_experimental': {
+    # Currently same as stable driver.
+    'swarming': {
+      'dimensions': {
+        'gpu': '10de:1cb3-23.21.13.8816',
+        'os': 'Windows-10',
+        'pool': 'Chrome-GPU',
+      },
+    },
+  },
+  'win10_nvidia_quadro_p400_stable': {
+    'swarming': {
+      'dimensions': {
+        'gpu': '10de:1cb3-23.21.13.8816',
+        'os': 'Windows-10',
+        'pool': 'Chrome-GPU',
+      },
+    },
+  },
   'win7': {
     'swarming': {
       'dimensions': {
@@ -260,6 +492,24 @@
       },
     },
   },
+  'win7_amd_r7_240': {
+    'swarming': {
+      'dimensions': {
+        'gpu': '1002:6613',
+        'os': 'Windows-2008ServerR2-SP1',
+        'pool': 'Chrome-GPU',
+      },
+    },
+  },
+  'win7_nvidia_quadro_p400': {
+    'swarming': {
+      'dimensions': {
+        'gpu': '10de:1cb3-23.21.13.8792',
+        'os': 'Windows-2008ServerR2-SP1',
+        'pool': 'Chrome-GPU',
+      },
+    },
+  },
   'win8': {
     'swarming': {
       'dimensions': {