Add branched versions of Phase B CQ builders.

All branch CQ builders have been moved to be low-experimental builders
(chromium_presubmit is left as 100% experiment since it has such modest
resource requirements). As we get capacity, they can be triggered more
often. As the builds get into a good state, they can be made
non-experimental.

Bug: 1024641, 922150
Change-Id: I97f277a2b6ad54e2fc4408d3c0017e37ed09ca05
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1949486Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Garrett Beaty <gbeaty@chromium.org>
Cr-Commit-Position: refs/heads/master@{#721244}

infra/config/buckets/try.star

@@ -129,12 +129,6 @@ android_builder(
     execution_timeout = 6 * time.hour,
 )
 
-android_builder(
-    name = 'android-kitkat-arm-rel',
-    goma_jobs = goma.jobs.J150,
-    tryjob = tryjob(),
-)
-
 android_builder(
     name = 'android-marshmallow-arm64-coverage-rel',
     cores = 16,
@@ -143,15 +137,6 @@ android_builder(
     use_java_coverage = True,
 )
 
-android_builder(
-    name = 'android-marshmallow-arm64-rel',
-    cores = 16,
-    goma_jobs = goma.jobs.J300,
-    ssd = True,
-    use_java_coverage = True,
-    tryjob = tryjob(),
-)
-
 android_builder(
     name = 'android-marshmallow-x86-fyi-rel',
 )
@@ -489,12 +474,6 @@ chromiumos_builder(
     goma_enable_ats = True,
 )
 
-chromiumos_builder(
-    name = 'chromeos-amd64-generic-rel',
-    goma_enable_ats = True,
-    tryjob = tryjob(),
-)
-
 chromiumos_builder(
     name = 'chromeos-arm-generic-dbg',
     goma_enable_ats = True,
@@ -536,13 +515,6 @@ chromiumos_builder(
     name = 'linux-chromeos-dbg',
 )
 
-chromiumos_builder(
-    name = 'linux-chromeos-rel',
-    goma_jobs = goma.jobs.J150,
-    tryjob = tryjob(),
-    use_clang_coverage = True,
-)
-
 
 def dawn_builder(*, name, **kwargs):
   return try_builder(
@@ -1297,12 +1269,6 @@ mac_builder(
     ssd = True,
 )
 
-mac_builder(
-    name = 'mac-rel',
-    goma_jobs = goma.jobs.J150,
-    tryjob = tryjob(),
-)
-
 # NOTE: the following 3 trybots aren't sensitive to Mac version on which
 # they are built, hence no additional dimension is specified.
 # The 10.xx version translates to which bots will run isolated tests.
@@ -1399,11 +1365,6 @@ mac_ios_builder(
     ),
 )
 
-mac_ios_builder(
-    name = 'ios-simulator',
-    tryjob = tryjob(),
-)
-
 mac_ios_builder(
     name = 'ios-simulator-cr-recipe',
     executable = luci.recipe(name = 'chromium_trybot'),
@@ -1580,14 +1541,6 @@ win_builder(
     os = os.WINDOWS_10,
 )
 
-win_builder(
-    name = 'win10_chromium_x64_rel_ng',
-    goma_jobs = goma.jobs.J150,
-    os = os.WINDOWS_10,
-    ssd = True,
-    tryjob = tryjob(),
-)
-
 win_builder(
     name = 'win10_chromium_x64_rel_ng_exp',
     builderless = False,

infra/config/consoles/try-beta.star

 luci.list_view(
     name = 'try-beta',
     entries = [
+        'try-beta/android-kitkat-arm-rel',
+        'try-beta/android-marshmallow-arm64-rel',
+        'try-beta/chromeos-amd64-generic-rel',
         'try-beta/chromium_presubmit',
+        'try-beta/ios-simulator',
+        'try-beta/linux-chromeos-rel',
         'try-beta/linux-rel',
+        'try-beta/mac-rel',
+        'try-beta/win10_chromium_x64_rel_ng',
     ],
 )

infra/config/consoles/try-stable.star

 luci.list_view(
     name = 'try-stable',
     entries = [
+        'try-stable/android-kitkat-arm-rel',
+        'try-stable/android-marshmallow-arm64-rel',
+        'try-stable/chromeos-amd64-generic-rel',
         'try-stable/chromium_presubmit',
+        'try-stable/ios-simulator',
+        'try-stable/linux-chromeos-rel',
         'try-stable/linux-rel',
+        'try-stable/mac-rel',
+        'try-stable/win10_chromium_x64_rel_ng',
     ],
 )

infra/config/generated/commit-queue.cfg

@@ -371,14 +371,42 @@ config_groups: <
       url: "https://chromium-status.appspot.com/"
     >
     tryjob: <
+      builders: <
+        name: "chromium/try-beta/android-kitkat-arm-rel"
+        experiment_percentage: 1
+      >
+      builders: <
+        name: "chromium/try-beta/android-marshmallow-arm64-rel"
+        experiment_percentage: 1
+      >
+      builders: <
+        name: "chromium/try-beta/chromeos-amd64-generic-rel"
+        experiment_percentage: 1
+      >
       builders: <
         name: "chromium/try-beta/chromium_presubmit"
         disable_reuse: true
         experiment_percentage: 100
       >
+      builders: <
+        name: "chromium/try-beta/ios-simulator"
+        experiment_percentage: 1
+      >
+      builders: <
+        name: "chromium/try-beta/linux-chromeos-rel"
+        experiment_percentage: 1
+      >
       builders: <
         name: "chromium/try-beta/linux-rel"
-        experiment_percentage: 100
+        experiment_percentage: 1
+      >
+      builders: <
+        name: "chromium/try-beta/mac-rel"
+        experiment_percentage: 1
+      >
+      builders: <
+        name: "chromium/try-beta/win10_chromium_x64_rel_ng"
+        experiment_percentage: 1
       >
       retry_config: <
         single_quota: 1
@@ -408,14 +436,42 @@ config_groups: <
       url: "https://chromium-status.appspot.com/"
     >
     tryjob: <
+      builders: <
+        name: "chromium/try-stable/android-kitkat-arm-rel"
+        experiment_percentage: 1
+      >
+      builders: <
+        name: "chromium/try-stable/android-marshmallow-arm64-rel"
+        experiment_percentage: 1
+      >
+      builders: <
+        name: "chromium/try-stable/chromeos-amd64-generic-rel"
+        experiment_percentage: 1
+      >
       builders: <
         name: "chromium/try-stable/chromium_presubmit"
         disable_reuse: true
         experiment_percentage: 100
       >
+      builders: <
+        name: "chromium/try-stable/ios-simulator"
+        experiment_percentage: 1
+      >
+      builders: <
+        name: "chromium/try-stable/linux-chromeos-rel"
+        experiment_percentage: 1
+      >
       builders: <
         name: "chromium/try-stable/linux-rel"
-        experiment_percentage: 100
+        experiment_percentage: 1
+      >
+      builders: <
+        name: "chromium/try-stable/mac-rel"
+        experiment_percentage: 1
+      >
+      builders: <
+        name: "chromium/try-stable/win10_chromium_x64_rel_ng"
+        experiment_percentage: 1
       >
       retry_config: <
         single_quota: 1

infra/config/generated/luci-milo.cfg

@@ -11773,23 +11773,65 @@ consoles: <
 consoles: <
   id: "try-beta"
   name: "try-beta"
+  builders: <
+    name: "buildbucket/luci.chromium.try-beta/android-kitkat-arm-rel"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.try-beta/android-marshmallow-arm64-rel"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.try-beta/chromeos-amd64-generic-rel"
+  >
   builders: <
     name: "buildbucket/luci.chromium.try-beta/chromium_presubmit"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.try-beta/ios-simulator"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.try-beta/linux-chromeos-rel"
+  >
   builders: <
     name: "buildbucket/luci.chromium.try-beta/linux-rel"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.try-beta/mac-rel"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.try-beta/win10_chromium_x64_rel_ng"
+  >
   builder_view_only: true
 >
 consoles: <
   id: "try-stable"
   name: "try-stable"
+  builders: <
+    name: "buildbucket/luci.chromium.try-stable/android-kitkat-arm-rel"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.try-stable/android-marshmallow-arm64-rel"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.try-stable/chromeos-amd64-generic-rel"
+  >
   builders: <
     name: "buildbucket/luci.chromium.try-stable/chromium_presubmit"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.try-stable/ios-simulator"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.try-stable/linux-chromeos-rel"
+  >
   builders: <
     name: "buildbucket/luci.chromium.try-stable/linux-rel"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.try-stable/mac-rel"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.try-stable/win10_chromium_x64_rel_ng"
+  >
   builder_view_only: true
 >
 consoles: <

infra/config/versioned/milestones/m78/buckets/try.star

@@ -104,6 +104,64 @@ def try_builder(
 # after the last dot in the mastername and YYY is the OS
 
 
+def android_builder(*, name, **kwargs):
+  return try_builder(
+      name = name,
+      goma_backend = goma.backend.RBE_PROD,
+      mastername = 'tryserver.chromium.android',
+      **kwargs
+  )
+
+android_builder(
+    name = 'android-kitkat-arm-rel',
+    goma_jobs = goma.jobs.J150,
+    tryjob = tryjob(
+        # TODO(https://crbug.com/1024641) Make non-experimental
+        experiment_percentage = 1,
+    ),
+)
+
+android_builder(
+    name = 'android-marshmallow-arm64-rel',
+    cores = 16,
+    goma_jobs = goma.jobs.J300,
+    ssd = True,
+    use_java_coverage = True,
+    tryjob = tryjob(
+        # TODO(https://crbug.com/1024641) Make non-experimental
+        experiment_percentage = 1,
+    ),
+)
+
+
+def chromiumos_builder(*, name, **kwargs):
+  return try_builder(
+      name = name,
+      mastername = 'tryserver.chromium.chromiumos',
+      goma_backend = goma.backend.RBE_PROD,
+      **kwargs
+  )
+
+chromiumos_builder(
+    name = 'chromeos-amd64-generic-rel',
+    goma_enable_ats = True,
+    tryjob = tryjob(
+        # TODO(https://crbug.com/1024641) Make non-experimental
+        experiment_percentage = 1,
+    ),
+)
+
+chromiumos_builder(
+    name = 'linux-chromeos-rel',
+    goma_jobs = goma.jobs.J150,
+    tryjob = tryjob(
+        # TODO(https://crbug.com/1024641) Make non-experimental
+        experiment_percentage = 1,
+    ),
+    use_clang_coverage = True,
+)
+
+
 def linux_builder(*, name, **kwargs):
   return try_builder(
       name = name,
@@ -132,7 +190,80 @@ linux_builder(
     name = 'linux-rel',
     goma_backend = goma.backend.RBE_PROD,
     goma_jobs = goma.jobs.J150,
-    # TODO(https://crbug.com/1024637) Make non-experimental
-    tryjob = tryjob(experiment_percentage = 100),
+    tryjob = tryjob(
+        # TODO(https://crbug.com/1024637) Make non-experimental
+        experiment_percentage = 1,
+    ),
     use_clang_coverage = True,
 )
+
+
+def mac_builder(
+    *,
+    name,
+    cores=None,
+    goma_backend = goma.backend.RBE_PROD,
+    os=os.MAC_ANY,
+    **kwargs):
+  return try_builder(
+      name = name,
+      cores = cores,
+      goma_backend = goma_backend,
+      mastername = 'tryserver.chromium.mac',
+      os = os,
+      **kwargs
+  )
+
+mac_builder(
+    name = 'mac-rel',
+    goma_jobs = goma.jobs.J150,
+    tryjob = tryjob(
+        # TODO(https://crbug.com/1024641) Make non-experimental
+        experiment_percentage = 1,
+    ),
+)
+
+def mac_ios_builder(*, name, executable=luci.recipe(name = 'ios/try'), **kwargs):
+  return try_builder(
+      name = name,
+      caches = [
+          swarming.cache(
+              name = 'xcode_ios_11a1027',
+              path = 'xcode_ios_11a1027.app',
+          ),
+      ],
+      cores = None,
+      executable = executable,
+      mastername = 'tryserver.chromium.mac',
+      os = os.MAC_ANY,
+      **kwargs
+  )
+
+mac_ios_builder(
+    name = 'ios-simulator',
+    tryjob = tryjob(
+        # TODO(https://crbug.com/1024641) Make non-experimental
+        experiment_percentage = 1,
+    ),
+)
+
+
+def win_builder(*, name, builderless=True, os=os.WINDOWS_DEFAULT, **kwargs):
+  return try_builder(
+      name = name,
+      builderless = builderless,
+      mastername = 'tryserver.chromium.win',
+      os = os,
+      **kwargs
+  )
+
+win_builder(
+    name = 'win10_chromium_x64_rel_ng',
+    goma_jobs = goma.jobs.J150,
+    os = os.WINDOWS_10,
+    ssd = True,
+    tryjob = tryjob(
+        # TODO(https://crbug.com/1024641) Make non-experimental
+        experiment_percentage = 1,
+    ),
+)

infra/config/versioned/milestones/m79/buckets/try.star

@@ -104,6 +104,64 @@ def try_builder(
 # after the last dot in the mastername and YYY is the OS
 
 
+def android_builder(*, name, **kwargs):
+  return try_builder(
+      name = name,
+      goma_backend = goma.backend.RBE_PROD,
+      mastername = 'tryserver.chromium.android',
+      **kwargs
+  )
+
+android_builder(
+    name = 'android-kitkat-arm-rel',
+    goma_jobs = goma.jobs.J150,
+    tryjob = tryjob(
+        # TODO(https://crbug.com/1024641) Make non-experimental
+        experiment_percentage = 1,
+    ),
+)
+
+android_builder(
+    name = 'android-marshmallow-arm64-rel',
+    cores = 16,
+    goma_jobs = goma.jobs.J300,
+    ssd = True,
+    use_java_coverage = True,
+    tryjob = tryjob(
+        # TODO(https://crbug.com/1024641) Make non-experimental
+        experiment_percentage = 1,
+    ),
+)
+
+
+def chromiumos_builder(*, name, **kwargs):
+  return try_builder(
+      name = name,
+      mastername = 'tryserver.chromium.chromiumos',
+      goma_backend = goma.backend.RBE_PROD,
+      **kwargs
+  )
+
+chromiumos_builder(
+    name = 'chromeos-amd64-generic-rel',
+    goma_enable_ats = True,
+    tryjob = tryjob(
+        # TODO(https://crbug.com/1024641) Make non-experimental
+        experiment_percentage = 1,
+    ),
+)
+
+chromiumos_builder(
+    name = 'linux-chromeos-rel',
+    goma_jobs = goma.jobs.J150,
+    tryjob = tryjob(
+        # TODO(https://crbug.com/1024641) Make non-experimental
+        experiment_percentage = 1,
+    ),
+    use_clang_coverage = True,
+)
+
+
 def linux_builder(*, name, **kwargs):
   return try_builder(
       name = name,
@@ -132,7 +190,80 @@ linux_builder(
     name = 'linux-rel',
     goma_backend = goma.backend.RBE_PROD,
     goma_jobs = goma.jobs.J150,
-    # TODO(https://crbug.com/1024637) Make non-experimental
-    tryjob = tryjob(experiment_percentage = 100),
+    tryjob = tryjob(
+        # TODO(https://crbug.com/1024637) Make non-experimental
+        experiment_percentage = 1,
+    ),
     use_clang_coverage = True,
 )
+
+
+def mac_builder(
+    *,
+    name,
+    cores=None,
+    goma_backend = goma.backend.RBE_PROD,
+    os=os.MAC_ANY,
+    **kwargs):
+  return try_builder(
+      name = name,
+      cores = cores,
+      goma_backend = goma_backend,
+      mastername = 'tryserver.chromium.mac',
+      os = os,
+      **kwargs
+  )
+
+mac_builder(
+    name = 'mac-rel',
+    goma_jobs = goma.jobs.J150,
+    tryjob = tryjob(
+        # TODO(https://crbug.com/1024641) Make non-experimental
+        experiment_percentage = 1,
+    ),
+)
+
+def mac_ios_builder(*, name, executable=luci.recipe(name = 'ios/try'), **kwargs):
+  return try_builder(
+      name = name,
+      caches = [
+          swarming.cache(
+              name = 'xcode_ios_11a1027',
+              path = 'xcode_ios_11a1027.app',
+          ),
+      ],
+      cores = None,
+      executable = executable,
+      mastername = 'tryserver.chromium.mac',
+      os = os.MAC_ANY,
+      **kwargs
+  )
+
+mac_ios_builder(
+    name = 'ios-simulator',
+    tryjob = tryjob(
+        # TODO(https://crbug.com/1024641) Make non-experimental
+        experiment_percentage = 1,
+    ),
+)
+
+
+def win_builder(*, name, builderless=True, os=os.WINDOWS_DEFAULT, **kwargs):
+  return try_builder(
+      name = name,
+      builderless = builderless,
+      mastername = 'tryserver.chromium.win',
+      os = os,
+      **kwargs
+  )
+
+win_builder(
+    name = 'win10_chromium_x64_rel_ng',
+    goma_jobs = goma.jobs.J150,
+    os = os.WINDOWS_10,
+    ssd = True,
+    tryjob = tryjob(
+        # TODO(https://crbug.com/1024641) Make non-experimental
+        experiment_percentage = 1,
+    ),
+)

infra/config/versioned/trunk/buckets/try.star

@@ -104,6 +104,52 @@ def try_builder(
 # after the last dot in the mastername and YYY is the OS
 
 
+def android_builder(*, name, **kwargs):
+  return try_builder(
+      name = name,
+      goma_backend = goma.backend.RBE_PROD,
+      mastername = 'tryserver.chromium.android',
+      **kwargs
+  )
+
+android_builder(
+    name = 'android-kitkat-arm-rel',
+    goma_jobs = goma.jobs.J150,
+    tryjob = tryjob(),
+)
+
+android_builder(
+    name = 'android-marshmallow-arm64-rel',
+    cores = 16,
+    goma_jobs = goma.jobs.J300,
+    ssd = True,
+    use_java_coverage = True,
+    tryjob = tryjob(),
+)
+
+
+def chromiumos_builder(*, name, **kwargs):
+  return try_builder(
+      name = name,
+      mastername = 'tryserver.chromium.chromiumos',
+      goma_backend = goma.backend.RBE_PROD,
+      **kwargs
+  )
+
+chromiumos_builder(
+    name = 'chromeos-amd64-generic-rel',
+    goma_enable_ats = True,
+    tryjob = tryjob(),
+)
+
+chromiumos_builder(
+    name = 'linux-chromeos-rel',
+    goma_jobs = goma.jobs.J150,
+    tryjob = tryjob(),
+    use_clang_coverage = True,
+)
+
+
 def linux_builder(*, name, **kwargs):
   return try_builder(
       name = name,
@@ -133,3 +179,65 @@ linux_builder(
     tryjob = tryjob(),
     use_clang_coverage = True,
 )
+
+
+def mac_builder(
+    *,
+    name,
+    cores=None,
+    goma_backend = goma.backend.RBE_PROD,
+    os=os.MAC_ANY,
+    **kwargs):
+  return try_builder(
+      name = name,
+      cores = cores,
+      goma_backend = goma_backend,
+      mastername = 'tryserver.chromium.mac',
+      os = os,
+      **kwargs
+  )
+
+mac_builder(
+    name = 'mac-rel',
+    goma_jobs = goma.jobs.J150,
+    tryjob = tryjob(),
+)
+
+def mac_ios_builder(*, name, executable=luci.recipe(name = 'ios/try'), **kwargs):
+  return try_builder(
+      name = name,
+      caches = [
+          swarming.cache(
+              name = 'xcode_ios_11a1027',
+              path = 'xcode_ios_11a1027.app',
+          ),
+      ],
+      cores = None,
+      executable = executable,
+      mastername = 'tryserver.chromium.mac',
+      os = os.MAC_ANY,
+      **kwargs
+  )
+
+mac_ios_builder(
+    name = 'ios-simulator',
+    tryjob = tryjob(),
+)
+
+
+def win_builder(*, name, builderless=True, os=os.WINDOWS_DEFAULT, **kwargs):
+  return try_builder(
+      name = name,
+      builderless = builderless,
+      mastername = 'tryserver.chromium.win',
+      os = os,
+      **kwargs
+  )
+
+win_builder(
+    name = 'win10_chromium_x64_rel_ng',
+    goma_jobs = goma.jobs.J150,
+    os = os.WINDOWS_10,
+    ssd = True,
+    tryjob = tryjob(),
+)