Add "Infra" to the builder_name_schema

BUG=skia:4763
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2154433002

Review-Url: https://codereview.chromium.org/2154433002

diff --git a/tools/buildbot_spec.py b/tools/buildbot_spec.py
index 6ef6239..ddaebcc 100755 (executable)
--- a/tools/buildbot_spec.py
+++ b/tools/buildbot_spec.py
@@ -45,7 +45,8 @@ def gyp_defines(builder_dict):
   # skia_arch_type.
   if builder_dict['role'] == builder_name_schema.BUILDER_ROLE_BUILD:
     arch = builder_dict['target_arch']
-  elif builder_dict['role'] == builder_name_schema.BUILDER_ROLE_HOUSEKEEPER:
+  elif builder_dict['role'] in (builder_name_schema.BUILDER_ROLE_HOUSEKEEPER,
+                                builder_name_schema.BUILDER_ROLE_INFRA):
     arch = None
   else:
     arch = builder_dict['arch']

diff --git a/tools/builder_name_schema.json b/tools/builder_name_schema.json
index cffe9bf..6a8c921 100644 (file)
--- a/tools/builder_name_schema.json
+++ b/tools/builder_name_schema.json
@@ -12,6 +12,9 @@
     "Housekeeper": [
       "frequency"
     ],
+    "Infra": [
+      "frequency"
+    ],
     "Build": [
       "os",
       "compiler",

diff --git a/tools/builder_name_schema.py b/tools/builder_name_schema.py
index 990aa64..31a5cca 100644 (file)
--- a/tools/builder_name_schema.py
+++ b/tools/builder_name_schema.py
@@ -23,11 +23,13 @@ BUILDER_NAME_SEP = None
 BUILDER_ROLE_CANARY = 'Canary'
 BUILDER_ROLE_BUILD = 'Build'
 BUILDER_ROLE_HOUSEKEEPER = 'Housekeeper'
+BUILDER_ROLE_INFRA = 'Infra'
 BUILDER_ROLE_PERF = 'Perf'
 BUILDER_ROLE_TEST = 'Test'
 BUILDER_ROLES = (BUILDER_ROLE_CANARY,
                  BUILDER_ROLE_BUILD,
                  BUILDER_ROLE_HOUSEKEEPER,
+                 BUILDER_ROLE_INFRA,
                  BUILDER_ROLE_PERF,
                  BUILDER_ROLE_TEST)