Add SWANGLE CI and Try waterfalls.

A new waterfall for testing ANGLE running on top of SwiftShader on VMs
instead of real HW GPUs.

12 CI bots:
linux-swangle-tot-angle-x64
linux-swangle-tot-angle-x86
linux-swangle-tot-swiftshader-x64
linux-swangle-tot-swiftshader-x86
linux-swangle-x64
linux-swangle-x86
win-swangle-tot-angle-x64
win-swangle-tot-angle-x86
win-swangle-tot-swiftshader-x64
win-swangle-tot-swiftshader-x86
win-swangle-x64
win-swangle-x86

12 Try bots:
linux-swangle-try-tot-angle-x64
linux-swangle-try-tot-angle-x86
linux-swangle-try-tot-swiftshader-x64
linux-swangle-try-tot-swiftshader-x86
linux-swangle-try-x64
linux-swangle-try-x86
win-swangle-try-tot-angle-x64
win-swangle-try-tot-angle-x86
win-swangle-try-tot-swiftshader-x64
win-swangle-try-tot-swiftshader-x86
win-swangle-try-x64
win-swangle-try-x86

Not running any tests at this point, to be added in following CLs.

Bug: 1007018
No-try: true
Change-Id: Ia1c954a3da4bcee371093e6d91a6b3a02738a1fb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1881984
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#711736}

infra/config/buckets/ci.star

@@ -2212,6 +2212,83 @@ memory_builder(
 )
 
 
+def swangle_builder(*, name, **kwargs):
+  return builder(
+      name = name,
+      builderless = True,
+      mastername = 'chromium.swangle',
+      service_account = 'chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com',
+      **kwargs
+  )
+
+
+def swangle_linux_builder(
+    *,
+    name,
+    **kwargs):
+  return swangle_builder(
+      name = name,
+      os = os.LINUX_DEFAULT,
+      **kwargs
+  )
+
+swangle_linux_builder(
+    name = 'linux-swangle-tot-angle-x64'
+)
+
+swangle_linux_builder(
+    name = 'linux-swangle-tot-angle-x86'
+)
+
+swangle_linux_builder(
+    name = 'linux-swangle-tot-swiftshader-x64'
+)
+
+swangle_linux_builder(
+    name = 'linux-swangle-tot-swiftshader-x86'
+)
+
+swangle_linux_builder(
+    name = 'linux-swangle-x64'
+)
+
+swangle_linux_builder(
+    name = 'linux-swangle-x86'
+)
+
+
+def swangle_windows_builder(*, name, **kwargs):
+  return swangle_builder(
+      name = name,
+      os = os.WINDOWS_DEFAULT,
+      **kwargs
+  )
+
+swangle_windows_builder(
+    name = 'win-swangle-tot-angle-x64'
+)
+
+swangle_windows_builder(
+    name = 'win-swangle-tot-angle-x86'
+)
+
+swangle_windows_builder(
+    name = 'win-swangle-tot-swiftshader-x64'
+)
+
+swangle_windows_builder(
+    name = 'win-swangle-tot-swiftshader-x86'
+)
+
+swangle_windows_builder(
+    name = 'win-swangle-x64'
+)
+
+swangle_windows_builder(
+    name = 'win-swangle-x86'
+)
+
+
 def win_builder(*, name, os=os.WINDOWS_DEFAULT, **kwargs):
   return builder(
       name = name,

infra/config/buckets/try.star

@@ -1655,6 +1655,80 @@ mac_ios_builder(
 )
 
 
+def swangle_builder(*, name, **kwargs):
+  return try_builder(
+      name = name,
+      builderless = True,
+      mastername = 'tryserver.chromium.swangle',
+      service_account = 'chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com',
+      **kwargs
+  )
+
+
+def swangle_linux_builder(*, name, **kwargs):
+  return swangle_builder(
+      name = name,
+      os = os.LINUX_DEFAULT,
+      **kwargs
+  )
+
+swangle_linux_builder(
+    name = 'linux-swangle-try-tot-angle-x64'
+)
+
+swangle_linux_builder(
+    name = 'linux-swangle-try-tot-angle-x86'
+)
+
+swangle_linux_builder(
+    name = 'linux-swangle-try-tot-swiftshader-x64'
+)
+
+swangle_linux_builder(
+    name = 'linux-swangle-try-tot-swiftshader-x86'
+)
+
+swangle_linux_builder(
+    name = 'linux-swangle-try-x64'
+)
+
+swangle_linux_builder(
+    name = 'linux-swangle-try-x86'
+)
+
+
+def swangle_windows_builder(*, name, **kwargs):
+  return swangle_builder(
+      name = name,
+      os = os.WINDOWS_DEFAULT,
+      **kwargs
+  )
+
+swangle_windows_builder(
+    name = 'win-swangle-try-tot-angle-x64'
+)
+
+swangle_windows_builder(
+    name = 'win-swangle-try-tot-angle-x86'
+)
+
+swangle_windows_builder(
+    name = 'win-swangle-try-tot-swiftshader-x64'
+)
+
+swangle_windows_builder(
+    name = 'win-swangle-try-tot-swiftshader-x86'
+)
+
+swangle_windows_builder(
+    name = 'win-swangle-try-x64'
+)
+
+swangle_windows_builder(
+    name = 'win-swangle-try-x86'
+)
+
+
 def win_builder(*, name, builderless=True, os=os.WINDOWS_DEFAULT, **kwargs):
   return try_builder(
       name = name,

infra/config/consoles/chromium-header.textpb

@@ -145,6 +145,11 @@ links {
     url: "/p/chrome/g/chrome.perf.fyi/console"
     alt: "Chromium Perf FYI console"
   }
+  links {
+    text: "swangle"
+    url: "/p/chromium/g/chromium.swangle"
+    alt: "Chromium SWANGLE console"
+  }
   links {
     text: "webrtc"
     url: "/p/chromium/g/chromium.webrtc"
@@ -193,6 +198,11 @@ links {
     url: "/p/chromium/g/tryserver.chromium.mac/builders"
     alt: "Mac"
   }
+  links {
+    text: "swangle"
+    url: "/p/chromium/g/tryserver.chromium.swangle/builders"
+    alt: "SWANGLE"
+  }
   links {
     text: "win"
     url: "/p/chromium/g/tryserver.chromium.win/builders"

infra/config/consoles/chromium.swangle.star

+luci.console_view(
+    name = 'chromium.swangle',
+    header = '//consoles/chromium-header.textpb',
+    repo = 'https://chromium.googlesource.com/chromium/src',
+    entries = [
+        luci.console_view_entry(
+            builder = 'ci/win-swangle-x86',
+            category = 'DEPS|Windows',
+            short_name = 'x86',
+        ),
+        luci.console_view_entry(
+            builder = 'ci/win-swangle-x64',
+            category = 'DEPS|Windows',
+            short_name = 'x64',
+        ),
+        luci.console_view_entry(
+            builder = 'ci/linux-swangle-x86',
+            category = 'DEPS|Linux',
+            short_name = 'x86',
+        ),
+        luci.console_view_entry(
+            builder = 'ci/linux-swangle-x64',
+            category = 'DEPS|Linux',
+            short_name = 'x64',
+        ),
+        luci.console_view_entry(
+            builder = 'ci/win-swangle-tot-angle-x86',
+            category = 'ToT ANGLE|Windows',
+            short_name = 'x86',
+        ),
+        luci.console_view_entry(
+            builder = 'ci/win-swangle-tot-angle-x64',
+            category = 'ToT ANGLE|Windows',
+            short_name = 'x64',
+        ),
+        luci.console_view_entry(
+            builder = 'ci/linux-swangle-tot-angle-x86',
+            category = 'ToT ANGLE|Linux',
+            short_name = 'x86',
+        ),
+        luci.console_view_entry(
+            builder = 'ci/linux-swangle-tot-angle-x64',
+            category = 'ToT ANGLE|Linux',
+            short_name = 'x64',
+        ),
+        luci.console_view_entry(
+            builder = 'ci/win-swangle-tot-swiftshader-x86',
+            category = 'ToT SwiftShader|Windows',
+            short_name = 'x86',
+        ),
+        luci.console_view_entry(
+            builder = 'ci/win-swangle-tot-swiftshader-x64',
+            category = 'ToT SwiftShader|Windows',
+            short_name = 'x64',
+        ),
+        luci.console_view_entry(
+            builder = 'ci/linux-swangle-tot-swiftshader-x86',
+            category = 'ToT SwiftShader|Linux',
+            short_name = 'x86',
+        ),
+        luci.console_view_entry(
+            builder = 'ci/linux-swangle-tot-swiftshader-x64',
+            category = 'ToT SwiftShader|Linux',
+            short_name = 'x64',
+        ),
+    ],
+)

infra/config/consoles/tryserver.chromium.swangle.star

+luci.list_view(
+    name = 'tryserver.chromium.swangle',
+    entries = [
+        'linux-swangle-try-tot-angle-x64',
+        'linux-swangle-try-tot-angle-x86',
+        'linux-swangle-try-tot-swiftshader-x64',
+        'linux-swangle-try-tot-swiftshader-x86',
+        'linux-swangle-try-x64',
+        'linux-swangle-try-x86',
+        'win-swangle-try-tot-angle-x64',
+        'win-swangle-try-tot-angle-x86',
+        'win-swangle-try-tot-swiftshader-x64',
+        'win-swangle-try-tot-swiftshader-x86',
+        'win-swangle-try-x64',
+        'win-swangle-try-x86',
+    ],
+)

infra/config/generated/luci-scheduler.cfg

@@ -379,6 +379,12 @@ trigger {
   triggers: "linux-ozone-rel"
   triggers: "linux-archive-rel"
   triggers: "linux-fieldtrial-rel"
+  triggers: "linux-swangle-tot-angle-x64"
+  triggers: "linux-swangle-tot-angle-x86"
+  triggers: "linux-swangle-tot-swiftshader-x64"
+  triggers: "linux-swangle-tot-swiftshader-x86"
+  triggers: "linux-swangle-x64"
+  triggers: "linux-swangle-x86"
   triggers: "linux-wpt-fyi-rel"
   triggers: "linux-trusty-rel"
   triggers: "linux-win_cross-rel"
@@ -396,6 +402,12 @@ trigger {
   triggers: "win-archive-dbg"
   triggers: "win-archive-rel"
   triggers: "win-pixel-builder-rel"
+  triggers: "win-swangle-tot-angle-x64"
+  triggers: "win-swangle-tot-angle-x86"
+  triggers: "win-swangle-tot-swiftshader-x64"
+  triggers: "win-swangle-tot-swiftshader-x86"
+  triggers: "win-swangle-x64"
+  triggers: "win-swangle-x86"
   triggers: "win10-code-coverage" # TODO(crbug.com/1010732) Move when stable.
   triggers: "win32-arm64-rel"
   triggers: "win32-archive-dbg"
@@ -2115,6 +2127,66 @@ job {
   }
 }
 
+job {
+  id: "linux-swangle-tot-angle-x64"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-swangle-tot-angle-x64"
+  }
+}
+
+job {
+  id: "linux-swangle-tot-angle-x86"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-swangle-tot-angle-x86"
+  }
+}
+
+job {
+  id: "linux-swangle-tot-swiftshader-x64"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-swangle-tot-swiftshader-x64"
+  }
+}
+
+job {
+  id: "linux-swangle-tot-swiftshader-x86"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-swangle-tot-swiftshader-x86"
+  }
+}
+
+job {
+  id: "linux-swangle-x64"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-swangle-x64"
+  }
+}
+
+job {
+  id: "linux-swangle-x86"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-swangle-x86"
+  }
+}
+
 job {
   id: "linux-wpt-fyi-rel"
   acl_sets: "default"
@@ -2732,7 +2804,8 @@ job {
 }
 
 ################################################################################
-# Windows Builders. Sorted alphabetically.
+# Windows Builders. Sorted alphabetically except builder-Testers must follow
+# their builder-Builders.
 ################################################################################
 
 job {
@@ -3404,6 +3477,66 @@ job {
   }
 }
 
+job {
+  id: "win-swangle-tot-angle-x64"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-swangle-tot-angle-x64"
+  }
+}
+
+job {
+  id: "win-swangle-tot-angle-x86"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-swangle-tot-angle-x86"
+  }
+}
+
+job {
+  id: "win-swangle-tot-swiftshader-x64"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-swangle-tot-swiftshader-x64"
+  }
+}
+
+job {
+  id: "win-swangle-tot-swiftshader-x86"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-swangle-tot-swiftshader-x86"
+  }
+}
+
+job {
+  id: "win-swangle-x64"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-swangle-x64"
+  }
+}
+
+job {
+  id: "win-swangle-x86"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-swangle-x86"
+  }
+}
+
 job {
   id: "Win Builder"
   acl_sets: "default"

infra/config/luci-scheduler.cfg

@@ -379,6 +379,12 @@ trigger {
   triggers: "linux-ozone-rel"
   triggers: "linux-archive-rel"
   triggers: "linux-fieldtrial-rel"
+  triggers: "linux-swangle-tot-angle-x64"
+  triggers: "linux-swangle-tot-angle-x86"
+  triggers: "linux-swangle-tot-swiftshader-x64"
+  triggers: "linux-swangle-tot-swiftshader-x86"
+  triggers: "linux-swangle-x64"
+  triggers: "linux-swangle-x86"
   triggers: "linux-wpt-fyi-rel"
   triggers: "linux-trusty-rel"
   triggers: "linux-win_cross-rel"
@@ -396,6 +402,12 @@ trigger {
   triggers: "win-archive-dbg"
   triggers: "win-archive-rel"
   triggers: "win-pixel-builder-rel"
+  triggers: "win-swangle-tot-angle-x64"
+  triggers: "win-swangle-tot-angle-x86"
+  triggers: "win-swangle-tot-swiftshader-x64"
+  triggers: "win-swangle-tot-swiftshader-x86"
+  triggers: "win-swangle-x64"
+  triggers: "win-swangle-x86"
   triggers: "win10-code-coverage" # TODO(crbug.com/1010732) Move when stable.
   triggers: "win32-arm64-rel"
   triggers: "win32-archive-dbg"
@@ -2115,6 +2127,66 @@ job {
   }
 }
 
+job {
+  id: "linux-swangle-tot-angle-x64"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-swangle-tot-angle-x64"
+  }
+}
+
+job {
+  id: "linux-swangle-tot-angle-x86"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-swangle-tot-angle-x86"
+  }
+}
+
+job {
+  id: "linux-swangle-tot-swiftshader-x64"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-swangle-tot-swiftshader-x64"
+  }
+}
+
+job {
+  id: "linux-swangle-tot-swiftshader-x86"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-swangle-tot-swiftshader-x86"
+  }
+}
+
+job {
+  id: "linux-swangle-x64"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-swangle-x64"
+  }
+}
+
+job {
+  id: "linux-swangle-x86"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-swangle-x86"
+  }
+}
+
 job {
   id: "linux-wpt-fyi-rel"
   acl_sets: "default"
@@ -2732,7 +2804,8 @@ job {
 }
 
 ################################################################################
-# Windows Builders. Sorted alphabetically.
+# Windows Builders. Sorted alphabetically except builder-Testers must follow
+# their builder-Builders.
 ################################################################################
 
 job {
@@ -3404,6 +3477,66 @@ job {
   }
 }
 
+job {
+  id: "win-swangle-tot-angle-x64"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-swangle-tot-angle-x64"
+  }
+}
+
+job {
+  id: "win-swangle-tot-angle-x86"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-swangle-tot-angle-x86"
+  }
+}
+
+job {
+  id: "win-swangle-tot-swiftshader-x64"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-swangle-tot-swiftshader-x64"
+  }
+}
+
+job {
+  id: "win-swangle-tot-swiftshader-x86"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-swangle-tot-swiftshader-x86"
+  }
+}
+
+job {
+  id: "win-swangle-x64"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-swangle-x64"
+  }
+}
+
+job {
+  id: "win-swangle-x86"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-swangle-x86"
+  }
+}
+
 job {
   id: "Win Builder"
   acl_sets: "default"

infra/config/main.star

@@ -100,6 +100,7 @@ exec('//consoles/chromium.gpu.fyi.star')
 exec('//consoles/chromium.linux.star')
 exec('//consoles/chromium.mac.star')
 exec('//consoles/chromium.memory.star')
+exec('//consoles/chromium.swangle.star')
 exec('//consoles/chromium.webrtc.star')
 exec('//consoles/chromium.webrtc.fyi.star')
 exec('//consoles/chromium.win.star')
@@ -117,6 +118,7 @@ exec('//consoles/tryserver.chromium.chromiumos.star')
 exec('//consoles/tryserver.chromium.dawn.star')
 exec('//consoles/tryserver.chromium.linux.star')
 exec('//consoles/tryserver.chromium.mac.star')
+exec('//consoles/tryserver.chromium.swangle.star')
 exec('//consoles/tryserver.chromium.win.star')
 
 exec('//generators/cq-builders-md.star')

testing/buildbot/chromium.swangle.json

+{
+  "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
+  "AAAAA2 See generate_buildbot_json.py to make changes": {},
+  "linux-swangle-tot-angle-x64": {},
+  "linux-swangle-tot-angle-x86": {},
+  "linux-swangle-tot-swiftshader-x64": {},
+  "linux-swangle-tot-swiftshader-x86": {},
+  "linux-swangle-x64": {},
+  "linux-swangle-x86": {},
+  "win-swangle-tot-angle-x64": {},
+  "win-swangle-tot-angle-x86": {},
+  "win-swangle-tot-swiftshader-x64": {},
+  "win-swangle-tot-swiftshader-x86": {},
+  "win-swangle-x64": {},
+  "win-swangle-x86": {}
+}

testing/buildbot/waterfalls.pyl

@@ -3838,6 +3838,23 @@
       },
     },
   },
+  {
+    'name': 'chromium.swangle',
+    'machines': {
+      'linux-swangle-tot-angle-x64' : {},
+      'linux-swangle-tot-angle-x86' : {},
+      'linux-swangle-tot-swiftshader-x64' : {},
+      'linux-swangle-tot-swiftshader-x86' : {},
+      'linux-swangle-x64' : {},
+      'linux-swangle-x86' : {},
+      'win-swangle-tot-angle-x64' : {},
+      'win-swangle-tot-angle-x86' : {},
+      'win-swangle-tot-swiftshader-x64' : {},
+      'win-swangle-tot-swiftshader-x86' : {},
+      'win-swangle-x64' : {},
+      'win-swangle-x86' : {},
+    },
+  },
   {
     'name': 'chromium.swarm',
     'machines': {

tools/mb/mb_config.pyl

@@ -519,6 +519,21 @@
       'chromeos-kevin-builder-perf-fyi': 'official_cros_chrome_sdk',
     },
 
+    'chromium.swangle': {
+      'linux-swangle-tot-angle-x64': 'deqp_release_trybot',
+      'linux-swangle-tot-angle-x86': 'deqp_release_trybot_x86',
+      'linux-swangle-tot-swiftshader-x64': 'deqp_release_trybot',
+      'linux-swangle-tot-swiftshader-x86': 'deqp_release_trybot_x86',
+      'linux-swangle-x64': 'deqp_release_trybot',
+      'linux-swangle-x86': 'deqp_release_trybot_x86',
+      'win-swangle-tot-angle-x64': 'deqp_release_trybot',
+      'win-swangle-tot-angle-x86': 'deqp_release_trybot_x86',
+      'win-swangle-tot-swiftshader-x64': 'deqp_release_trybot',
+      'win-swangle-tot-swiftshader-x86': 'deqp_release_trybot_x86',
+      'win-swangle-x64': 'deqp_release_trybot',
+      'win-swangle-x86': 'deqp_release_trybot_x86',
+    },
+
     'chromium.swarm': {
       'Android N5 Swarm': 'android_release_bot_minimal_symbols',
       'Android N5X Swarm': 'android_release_bot_minimal_symbols_arm64',
@@ -885,6 +900,21 @@
       'Win x64 Builder Perf': 'official_goma',
     },
 
+    'tryserver.chromium.swangle': {
+      'linux-swangle-try-tot-angle-x64': 'deqp_release_trybot',
+      'linux-swangle-try-tot-angle-x86': 'deqp_release_trybot_x86',
+      'linux-swangle-try-tot-swiftshader-x64': 'deqp_release_trybot',
+      'linux-swangle-try-tot-swiftshader-x86': 'deqp_release_trybot_x86',
+      'linux-swangle-try-x64': 'deqp_release_trybot',
+      'linux-swangle-try-x86': 'deqp_release_trybot_x86',
+      'win-swangle-try-tot-angle-x64': 'deqp_release_trybot',
+      'win-swangle-try-tot-angle-x86': 'deqp_release_trybot_x86',
+      'win-swangle-try-tot-swiftshader-x64': 'deqp_release_trybot',
+      'win-swangle-try-tot-swiftshader-x86': 'deqp_release_trybot_x86',
+      'win-swangle-try-x64': 'deqp_release_trybot',
+      'win-swangle-try-x86': 'deqp_release_trybot_x86',
+    },
+
     'tryserver.chromium.win': {
       'gpu-fyi-try-win-xr-builder-64': 'gpu_fyi_tests_release_trybot',
       'gpu-fyi-try-win7-amd-dbg-32': 'gpu_fyi_tests_debug_trybot_x86',