Prepare infra/config for Branch CI/CQ Phase D.

Phase D migrates all of the try builders that are not includable-only. Migrate the try builders and the builders that they mirror to the versioned subdirectory. bucketed_triggers is set to False for the ci builders since there are not yet multiple builders with the same name to result in a different scheduler job name. They will be removed on branch day. Bug: 1024644 Change-Id: I68f05c82b631b0ae56200f62599a440ecb02d70b Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2098274 Commit-Queue: Garrett Beaty <gbeaty@chromium.org> Reviewed-by: Aaron Gable <agable@chromium.org> Cr-Commit-Position: refs/heads/master@{#750204}

Prepare infra/config for Branch CI/CQ Phase D.
Phase D migrates all of the try builders that are not includable-only. Migrate the try builders and the builders that they mirror to the versioned subdirectory. bucketed_triggers is set to False for the ci builders since there are not yet multiple builders with the same name to result in a different scheduler job name. They will be removed on branch day. Bug: 1024644 Change-Id: I68f05c82b631b0ae56200f62599a440ecb02d70b Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2098274 Commit-Queue: Garrett Beaty <gbeaty@chromium.org> Reviewed-by: Aaron Gable <agable@chromium.org> Cr-Commit-Position: refs/heads/master@{#750204}
517d3e8c · Garrett Beaty · Commit Bot · 584f21d8 · 517d3e8c · 517d3e8c
Commit 517d3e8c authored Mar 13, 2020 by Garrett Beaty Committed by Commit Bot Mar 13, 2020
5 changed files
--- a/infra/config/buckets/ci.star
+++ b/infra/config/buckets/ci.star
@@ -138,41 +138,6 @@ ci.android_builder(
    triggered_by = ['ci/Android arm Builder (dbg)'],
 )
-ci.android_builder(
-    name = 'Android WebView M (dbg)',
-    triggered_by = ['Android arm64 Builder (dbg)'],
-)
-ci.android_builder(
-    name = 'Android WebView N (dbg)',
-    triggered_by = ['Android arm64 Builder (dbg)'],
-)
-ci.android_builder(
-    name = 'Android WebView O (dbg)',
-    triggered_by = ['Android arm64 Builder (dbg)'],
-)
-ci.android_builder(
-    name = 'Android WebView P (dbg)',
-    triggered_by = ['Android arm64 Builder (dbg)'],
-)
-ci.android_builder(
-    name = 'Android arm64 Builder (dbg)',
-    goma_jobs = goma.jobs.MANY_JOBS_FOR_CI,
-    execution_timeout = 4 * time.hour,
-)
-ci.android_builder(
-    name = 'Android x64 Builder (dbg)',
-    execution_timeout = 4 * time.hour,
-)
-ci.android_builder(
-    name = 'Android x86 Builder (dbg)',
-)
 ci.android_builder(
    name = 'Deterministic Android',
    executable = 'recipe:swarming/deterministic_build',
@@ -222,32 +187,12 @@ ci.android_builder(
    triggered_by = ['ci/Android arm Builder (dbg)'],
 )
-ci.android_builder(
-    name = 'Marshmallow 64 bit Tester',
-    triggered_by = ['Android arm64 Builder (dbg)'],
-)
-ci.android_builder(
-    name = 'Nougat Phone Tester',
-    triggered_by = ['Android arm64 Builder (dbg)'],
-)
-ci.android_builder(
-    name = 'Oreo Phone Tester',
-    triggered_by = ['Android arm64 Builder (dbg)'],
-)
 ci.android_builder(
    name = 'android-arm64-proguard-rel',
    goma_jobs = goma.jobs.MANY_JOBS_FOR_CI,
    execution_timeout = 6 * time.hour,
 )
-ci.android_builder(
-    name = 'android-cronet-arm-dbg',
-    notifies = ['cronet'],
-)
 ci.android_builder(
    name = 'android-cronet-arm64-dbg',
    notifies = ['cronet'],
@@ -297,15 +242,6 @@ ci.android_builder(
    name = 'android-lollipop-arm-rel',
 )
-ci.android_builder(
-    name = 'android-pie-arm64-dbg',
-    triggered_by = ['Android arm64 Builder (dbg)'],
-)
-ci.android_builder(
-    name = 'android-pie-arm64-rel',
-)
 ci.android_builder(
    name = 'android-10-arm64-rel',
 )
@@ -410,18 +346,10 @@ ci.chromiumos_builder(
    name = 'chromeos-amd64-generic-cfi-thin-lto-rel',
 )
-ci.chromiumos_builder(
-    name = 'chromeos-amd64-generic-dbg',
-)
 ci.chromiumos_builder(
    name = 'chromeos-arm-generic-dbg',
 )
-ci.chromiumos_builder(
-    name = 'chromeos-kevin-rel',
-)
 ci.clang_builder(
    name = 'CFI Linux CF',
@@ -582,24 +510,6 @@ ci.dawn_builder(
    name = 'Dawn Linux x64 Builder',
 )
-ci.dawn_builder(
-    name = 'Dawn Linux x64 DEPS Builder',
-)
-ci.dawn_builder(
-    name = 'Dawn Linux x64 DEPS Release (Intel HD 630)',
-    cores = 2,
-    os = os.LINUX_DEFAULT,
-    triggered_by = ['Dawn Linux x64 DEPS Builder'],
-)
-ci.dawn_builder(
-    name = 'Dawn Linux x64 DEPS Release (NVIDIA)',
-    cores = 2,
-    os = os.LINUX_DEFAULT,
-    triggered_by = ['Dawn Linux x64 DEPS Builder'],
-)
 ci.dawn_builder(
    name = 'Dawn Linux x64 Release (Intel HD 630)',
    cores = 2,
@@ -621,29 +531,6 @@ ci.dawn_builder(
    os = os.MAC_ANY,
 )
-ci.dawn_builder(
-    name = 'Dawn Mac x64 DEPS Builder',
-    builderless = False,
-    cores = None,
-    os = os.MAC_ANY,
-)
-# Note that the Mac testers are all thin Linux VMs, triggering jobs on the
-# physical Mac hardware in the Swarming pool which is why they run on linux
-ci.dawn_builder(
-    name = 'Dawn Mac x64 DEPS Release (AMD)',
-    cores = 2,
-    os = os.LINUX_DEFAULT,
-    triggered_by = ['Dawn Mac x64 DEPS Builder'],
-)
-ci.dawn_builder(
-    name = 'Dawn Mac x64 DEPS Release (Intel)',
-    cores = 2,
-    os = os.LINUX_DEFAULT,
-    triggered_by = ['Dawn Mac x64 DEPS Builder'],
-)
 ci.dawn_builder(
    name = 'Dawn Mac x64 Release (AMD)',
    cores = 2,
@@ -698,44 +585,6 @@ ci.dawn_builder(
    triggered_by = ['Dawn Win10 x64 Builder'],
 )
-ci.dawn_builder(
-    name = 'Dawn Win10 x86 DEPS Builder',
-    os = os.WINDOWS_ANY,
-)
-ci.dawn_builder(
-    name = 'Dawn Win10 x64 DEPS Builder',
-    os = os.WINDOWS_ANY,
-)
-ci.dawn_builder(
-    name = 'Dawn Win10 x86 DEPS Release (Intel HD 630)',
-    cores = 2,
-    os = os.LINUX_DEFAULT,
-    triggered_by = ['Dawn Win10 x86 DEPS Builder'],
-)
-ci.dawn_builder(
-    name = 'Dawn Win10 x64 DEPS Release (Intel HD 630)',
-    cores = 2,
-    os = os.LINUX_DEFAULT,
-    triggered_by = ['Dawn Win10 x64 DEPS Builder'],
-)
-ci.dawn_builder(
-    name = 'Dawn Win10 x86 DEPS Release (NVIDIA)',
-    cores = 2,
-    os = os.LINUX_DEFAULT,
-    triggered_by = ['Dawn Win10 x86 DEPS Builder'],
-)
-ci.dawn_builder(
-    name = 'Dawn Win10 x64 DEPS Release (NVIDIA)',
-    cores = 2,
-    os = os.LINUX_DEFAULT,
-    triggered_by = ['Dawn Win10 x64 DEPS Builder'],
-)
 ci.fuzz_builder(
    name = 'ASAN Debug',
@@ -1004,10 +853,6 @@ ci.fyi_builder(
    name = 'Site Isolation Android',
 )
-ci.fyi_builder(
-    name = 'VR Linux',
-)
 ci.fyi_builder(
    name = 'android-mojo-webview-rel',
 )
@@ -1016,10 +861,6 @@ ci.fyi_builder(
    name = 'chromeos-amd64-generic-rel-vm-tests',
 )
-ci.fyi_builder(
-    name = 'chromeos-kevin-rel-hw-tests',
-)
 ci.fyi_builder(
    name = 'fuchsia-fyi-arm64-rel',
    notifies = ['cr-fuchsia'],
@@ -1694,38 +1535,14 @@ ci.linux_builder(
    name = 'Leak Detection Linux',
 )
-ci.linux_builder(
-    name = 'Linux Builder (dbg)',
-)
 ci.linux_builder(
    name = 'Linux Builder (dbg)(32)',
 )
-ci.linux_builder(
-    name = 'Linux Tests (dbg)(1)',
-    triggered_by = ['Linux Builder (dbg)'],
-)
 ci.linux_builder(
    name = 'Network Service Linux',
 )
-ci.linux_builder(
-    name = 'fuchsia-arm64-cast',
-    notifies = ['cr-fuchsia'],
-)
-ci.linux_builder(
-    name = 'fuchsia-x64-cast',
-    notifies = ['cr-fuchsia'],
-)
-ci.linux_builder(
-    name = 'fuchsia-x64-dbg',
-    notifies = ['cr-fuchsia'],
-)
 ci.linux_builder(
    name = 'linux-gcc-rel',
    goma_backend = None,

--- a/infra/config/buckets/try.star
+++ b/infra/config/buckets/try.star
--- a/infra/config/generators/scheduler-noop-jobs.star
+++ b/infra/config/generators/scheduler-noop-jobs.star
 # Don't make a habit of this - it isn't public API
 load('@stdlib//internal/luci/proto.star', 'scheduler_pb')
+# TODO(https://crbug.com/1024644) On branch day, create no-op jobs for branch buckets
 _GPU_NOOP_JOBS = [scheduler_pb.Job(
    id = builder,
    schedule = 'triggered',

--- a/infra/config/versioned/trunk/buckets/ci.star
+++ b/infra/config/versioned/trunk/buckets/ci.star
@@ -40,15 +40,92 @@ ci.defaults.triggered_by.set([vars.poller.get()])
 # them, then lexicographically by their name
+ci.android_builder(
+    name = 'Android WebView M (dbg)',
+    triggered_by = [vars.bucket.builder('Android arm64 Builder (dbg)')],
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
+ci.android_builder(
+    name = 'Android WebView N (dbg)',
+    triggered_by = [vars.bucket.builder('Android arm64 Builder (dbg)')],
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
+ci.android_builder(
+    name = 'Android WebView O (dbg)',
+    triggered_by = [vars.bucket.builder('Android arm64 Builder (dbg)')],
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
+ci.android_builder(
+    name = 'Android WebView P (dbg)',
+    triggered_by = [vars.bucket.builder('Android arm64 Builder (dbg)')],
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
 ci.android_builder(
    name = 'Android arm Builder (dbg)',
    execution_timeout = 4 * time.hour,
 )
+ci.android_builder(
+    name = 'Android arm64 Builder (dbg)',
+    goma_jobs = goma.jobs.MANY_JOBS_FOR_CI,
+    execution_timeout = 4 * time.hour,
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
+ci.android_builder(
+    name = 'Android x64 Builder (dbg)',
+    execution_timeout = 4 * time.hour,
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
+ci.android_builder(
+    name = 'Android x86 Builder (dbg)',
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
 ci.android_builder(
    name = 'Cast Android (dbg)',
 )
+ci.android_builder(
+    name = 'Marshmallow 64 bit Tester',
+    triggered_by = [vars.bucket.builder('Android arm64 Builder (dbg)')],
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
+ci.android_builder(
+    name = 'Nougat Phone Tester',
+    triggered_by = [vars.bucket.builder('Android arm64 Builder (dbg)')],
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
+ci.android_builder(
+    name = 'Oreo Phone Tester',
+    triggered_by = [vars.bucket.builder('Android arm64 Builder (dbg)')],
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
+ci.android_builder(
+    name = 'android-cronet-arm-dbg',
+    notifies = ['cronet'],
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
 ci.android_builder(
    name = 'android-cronet-arm-rel',
    notifies = ['cronet'],
@@ -74,6 +151,25 @@ ci.android_builder(
    name = 'android-marshmallow-arm64-rel',
 )
+ci.android_builder(
+    name = 'android-pie-arm64-dbg',
+    triggered_by = [vars.bucket.builder('Android arm64 Builder (dbg)')],
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
+ci.android_builder(
+    name = 'android-pie-arm64-rel',
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
+ci.chromiumos_builder(
+    name = 'chromeos-amd64-generic-dbg',
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
 ci.chromiumos_builder(
    name = 'chromeos-amd64-generic-rel',
@@ -83,6 +179,18 @@ ci.chromiumos_builder(
    name = 'chromeos-arm-generic-rel',
 )
+ci.chromiumos_builder(
+    name = 'chromeos-kevin-rel',
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
+ci.fyi_builder(
+    name = 'chromeos-kevin-rel-hw-tests',
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
 ci.chromiumos_builder(
    name = 'linux-chromeos-dbg',
 )
@@ -92,6 +200,116 @@ ci.chromiumos_builder(
 )
+ci.dawn_builder(
+    name = 'Dawn Linux x64 DEPS Builder',
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
+ci.dawn_builder(
+    name = 'Dawn Linux x64 DEPS Release (Intel HD 630)',
+    cores = 2,
+    os = os.LINUX_DEFAULT,
+    triggered_by = [vars.bucket.builder('Dawn Linux x64 DEPS Builder')],
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
+ci.dawn_builder(
+    name = 'Dawn Linux x64 DEPS Release (NVIDIA)',
+    cores = 2,
+    os = os.LINUX_DEFAULT,
+    triggered_by = [vars.bucket.builder('Dawn Linux x64 DEPS Builder')],
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
+ci.dawn_builder(
+    name = 'Dawn Mac x64 DEPS Builder',
+    builderless = False,
+    cores = None,
+    os = os.MAC_ANY,
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
+# Note that the Mac testers are all thin Linux VMs, triggering jobs on the
+# physical Mac hardware in the Swarming pool which is why they run on linux
+ci.dawn_builder(
+    name = 'Dawn Mac x64 DEPS Release (AMD)',
+    cores = 2,
+    os = os.LINUX_DEFAULT,
+    triggered_by = [vars.bucket.builder('Dawn Mac x64 DEPS Builder')],
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
+ci.dawn_builder(
+    name = 'Dawn Mac x64 DEPS Release (Intel)',
+    cores = 2,
+    os = os.LINUX_DEFAULT,
+    triggered_by = [vars.bucket.builder('Dawn Mac x64 DEPS Builder')],
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
+ci.dawn_builder(
+    name = 'Dawn Win10 x64 DEPS Builder',
+    os = os.WINDOWS_ANY,
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
+ci.dawn_builder(
+    name = 'Dawn Win10 x64 DEPS Release (Intel HD 630)',
+    cores = 2,
+    os = os.LINUX_DEFAULT,
+    triggered_by = [vars.bucket.builder('Dawn Win10 x64 DEPS Builder')],
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
+ci.dawn_builder(
+    name = 'Dawn Win10 x64 DEPS Release (NVIDIA)',
+    cores = 2,
+    os = os.LINUX_DEFAULT,
+    triggered_by = [vars.bucket.builder('Dawn Win10 x64 DEPS Builder')],
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
+ci.dawn_builder(
+    name = 'Dawn Win10 x86 DEPS Builder',
+    os = os.WINDOWS_ANY,
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
+ci.dawn_builder(
+    name = 'Dawn Win10 x86 DEPS Release (Intel HD 630)',
+    cores = 2,
+    os = os.LINUX_DEFAULT,
+    triggered_by = [vars.bucket.builder('Dawn Win10 x86 DEPS Builder')],
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
+ci.dawn_builder(
+    name = 'Dawn Win10 x86 DEPS Release (NVIDIA)',
+    cores = 2,
+    os = os.LINUX_DEFAULT,
+    triggered_by = [vars.bucket.builder('Dawn Win10 x86 DEPS Builder')],
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
+ci.fyi_builder(
+    name = 'VR Linux',
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
 # This is launching & collecting entirely isolated tests.
 # OS shouldn't matter.
 ci.fyi_builder(
@@ -170,12 +388,46 @@ ci.linux_builder(
    name = 'Linux Builder',
 )
+ci.linux_builder(
+    name = 'Linux Builder (dbg)',
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
 ci.linux_builder(
    name = 'Linux Tests',
    goma_backend = None,
    triggered_by = [vars.bucket.builder('Linux Builder')],
 )
+ci.linux_builder(
+    name = 'Linux Tests (dbg)(1)',
+    triggered_by = [vars.bucket.builder('Linux Builder (dbg)')],
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
+ci.linux_builder(
+    name = 'fuchsia-arm64-cast',
+    notifies = ['cr-fuchsia'],
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
+ci.linux_builder(
+    name = 'fuchsia-x64-cast',
+    notifies = ['cr-fuchsia'],
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
+ci.linux_builder(
+    name = 'fuchsia-x64-dbg',
+    notifies = ['cr-fuchsia'],
+    # TODO(https://crbug.com/1024644) Remove bucketed_triggers value on branch day
+    bucketed_triggers = False,
+)
 ci.linux_builder(
    name = 'linux-ozone-rel',
 )

--- a/infra/config/versioned/trunk/buckets/try.star
+++ b/infra/config/versioned/trunk/buckets/try.star