Deploy new Win and Linux Intel HD 530 GPU bots.

content/test/gpu/generate_buildbot_json.py

Index: content/test/gpu/generate_buildbot_json.py
diff --git a/content/test/gpu/generate_buildbot_json.py b/content/test/gpu/generate_buildbot_json.py
index 5e6e4484b2349bea8a05e8780d1aecc2b78c3433..c8af5304645d3a21ccfa0daed768a98c3fa2185e 100755
--- a/content/test/gpu/generate_buildbot_json.py
+++ b/content/test/gpu/generate_buildbot_json.py
@@ -232,11 +232,11 @@ FYI_WATERFALL = {
       'swarming': False,
       'os_type': 'win',
     },
-    'Win7 Release (New Intel)': {
+    'Win10 Release (New Intel)': {
       'swarming_dimensions': [
         {
           'gpu': '8086:0412',
-          'os': 'Windows-2008ServerR2-SP1'
+          'os': 'Windows-10',
         },
       ],
       'build_config': 'Release',
@@ -245,36 +245,36 @@ FYI_WATERFALL = {
       'swarming': False,
       'os_type': 'win',
     },
-    'Win10 Release (New Intel)': {
+    'Win10 Debug (New Intel)': {
       'swarming_dimensions': [
         {
           'gpu': '8086:0412',
           'os': 'Windows-10',
         },
       ],
-      'build_config': 'Release',
+      'build_config': 'Debug',
       # This bot is a one-off and doesn't have similar slaves in the
       # swarming pool.
       'swarming': False,
       'os_type': 'win',
     },
-    'Win7 Debug (New Intel)': {
+    'Win10 Release (Intel HD 530)': {
       'swarming_dimensions': [
         {
-          'gpu': '8086:0412',
-          'os': 'Windows-2008ServerR2-SP1'
+          'gpu': '8086:1912',
+          'os': 'Windows-10',
         },
       ],
-      'build_config': 'Debug',
+      'build_config': 'Release',
       # This bot is a one-off and doesn't have similar slaves in the
       # swarming pool.
       'swarming': False,
       'os_type': 'win',
     },
-    'Win10 Debug (New Intel)': {
+    'Win10 Debug (Intel HD 530)': {
       'swarming_dimensions': [
         {
-          'gpu': '8086:0412',
+          'gpu': '8086:1912',
           'os': 'Windows-10',
         },
       ],
@@ -532,6 +532,32 @@ FYI_WATERFALL = {
       'swarming': False,
       'os_type': 'linux',
     },
+    'Linux Release (Intel HD 530)': {
+      'swarming_dimensions': [
+        {
+          'gpu': '8086:1912',
+          'os': 'Linux'
+        },
+      ],
+      'build_config': 'Release',
+      # This bot is a one-off and doesn't have similar slaves in the
+      # swarming pool.
+      'swarming': False,
+      'os_type': 'linux',
+    },
+    'Linux Debug (Intel HD 530)': {
+      'swarming_dimensions': [
+        {
+          'gpu': '8086:1912',
+          'os': 'Linux'
+        },
+      ],
+      'build_config': 'Debug',
+      # This bot is a one-off and doesn't have similar slaves in the
+      # swarming pool.
+      'swarming': False,
+      'os_type': 'linux',
+    },
     'Linux Release (AMD R7 240)': {
       'swarming_dimensions': [
         {