commit b894606a30271d75c472ad31c64f00e5b808e6af
author Garrett Beaty <gbeaty@chromium.org> Fri Aug 14 00:19:41 2020
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Aug 14 00:19:41 2020
tree f3489e7324cd2ff783337a9caec93750fa902402
parent de2f7e7944a675fc518ebc8f97c7cf4f8585b5fc

Update angle recipe to refer to builder groups.

Bug: 1109276
Change-Id: Id76998621e18ec8ceb4d6f2fe1aaf2b16a8bd717
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/build/+/2355175
Auto-Submit: Garrett Beaty <gbeaty@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>

scripts/slave/recipes/angle.py

diff --git a/scripts/slave/recipes/angle.py b/scripts/slave/recipes/angle.py
index 6876ea8..ec123f7 100644
--- a/scripts/slave/recipes/angle.py
+++ b/scripts/slave/recipes/angle.py
@@ -3,21 +3,22 @@
 # found in the LICENSE file.
 
 DEPS = [
-  'depot_tools/bot_update',
-  'depot_tools/depot_tools',
-  'depot_tools/gclient',
-  'depot_tools/osx_sdk',
-  'goma',
-  'depot_tools/gsutil',
-  'recipe_engine/context',
-  'recipe_engine/file',
-  'recipe_engine/json',
-  'recipe_engine/path',
-  'recipe_engine/platform',
-  'recipe_engine/properties',
-  'recipe_engine/python',
-  'recipe_engine/step',
-  'recipe_engine/time',
+    'builder_group',
+    'depot_tools/bot_update',
+    'depot_tools/depot_tools',
+    'depot_tools/gclient',
+    'depot_tools/osx_sdk',
+    'goma',
+    'depot_tools/gsutil',
+    'recipe_engine/context',
+    'recipe_engine/file',
+    'recipe_engine/json',
+    'recipe_engine/path',
+    'recipe_engine/platform',
+    'recipe_engine/properties',
+    'recipe_engine/python',
+    'recipe_engine/step',
+    'recipe_engine/time',
 ]
 
 from recipe_engine.recipe_api import Property
@@ -142,18 +143,16 @@
   yield api.test(
       'linux',
       api.platform('linux', 64),
+      api.builder_group.for_current('client.angle'),
       api.properties(
-          mastername='client.angle',
-          buildername='linux',
-          buildnumber='1234',
-          bot_id='test_slave'),
+          buildername='linux', buildnumber='1234', bot_id='test_slave'),
   )
   yield api.test(
       'linux_gcc',
       api.platform('linux', 64),
+      api.builder_group.for_current('client.angle'),
       api.properties(
           clang=False,
-          mastername='client.angle',
           buildername='linux-gcc',
           buildnumber='1234',
           bot_id='test_slave'),
@@ -161,18 +160,16 @@
   yield api.test(
       'win',
       api.platform('win', 64),
+      api.builder_group.for_current('client.angle'),
       api.properties(
-          mastername='client.angle',
-          buildername='windows',
-          buildnumber='1234',
-          bot_id='test_slave'),
+          buildername='windows', buildnumber='1234', bot_id='test_slave'),
   )
   yield api.test(
       'win_clang',
       api.platform('win', 64),
+      api.builder_group.for_current('client.angle'),
       api.properties(
           clang=True,
-          mastername='client.angle',
           buildername='windows',
           buildnumber='1234',
           bot_id='test_slave'),
@@ -180,11 +177,11 @@
   yield api.test(
       'win_rel_msvc_x86',
       api.platform('win', 64),
+      api.builder_group.for_current('client.angle'),
       api.properties(
           clang=False,
           debug=False,
           target_cpu='x86',
-          mastername='client.angle',
           buildername='windows',
           buildnumber='1234',
           bot_id='test_slave'),
@@ -192,11 +189,11 @@
   yield api.test(
       'winuwp_dbg_msvc_x64',
       api.platform('win', 64),
+      api.builder_group.for_current('client.angle'),
       api.properties(
           clang=False,
           debug=True,
           uwp=True,
-          mastername='client.angle',
           buildername='windows',
           buildnumber='1234',
           bot_id='test_slave'),