Correct the waterfall configuration in preparation for branching.

The CI builders that some of the waterfall try builders mirror were not
correctly set up to be branched and have been moved from
//buckets/ci.star to //versioned/trunk/buckets/ci.star.

The CI builders that some of the waterfall try builders mirror were not
included in the main console and have been added.

The main console included a number of builders that are not mirrors of
any waterfall try builders, presumably due to the now-removed
requirement that the subwaterfall categories in the main console match
the subwaterfall console.

Change-Id: I2185fb00756c85d93ee64ed3f9926f2fcfec21ac
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2134696
Commit-Queue: Garrett Beaty <gbeaty@chromium.org>
Auto-Submit: Garrett Beaty <gbeaty@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>
Cr-Commit-Position: refs/heads/master@{#756317}

infra/config/buckets/ci.star

@@ -1044,15 +1044,6 @@ ci.fyi_ios_builder(
     },
 )
 
-ci.fyi_ios_builder(
-    name = 'ios-simulator-cronet',
-    executable = 'recipe:chromium',
-    notifies = ['cronet'],
-    properties = {
-        'xcode_build_version': '11c29',
-    },
-)
-
 ci.fyi_ios_builder(
     name = 'ios-webkit-tot',
     caches = [xcode_cache.x11c505wk],
@@ -1640,11 +1631,6 @@ ci.mac_ios_builder(
     executable = 'recipe:chromium',
 )
 
-ci.mac_ios_builder(
-    name = 'ios-simulator-full-configs',
-    executable = 'recipe:chromium',
-)
-
 ci.mac_ios_builder(
     name = 'ios-simulator-noncq',
 )
@@ -1697,15 +1683,6 @@ ci.memory_builder(
     triggered_by = ['Linux MSan Builder'],
 )
 
-ci.memory_builder(
-    name = 'Linux TSan Builder',
-)
-
-ci.memory_builder(
-    name = 'Linux TSan Tests',
-    triggered_by = ['Linux TSan Builder'],
-)
-
 ci.memory_builder(
     name = 'Mac ASan 64 Builder',
     builderless = False,

infra/config/generated/cr-buildbucket.cfg

@@ -3172,6 +3172,7 @@ buckets: <
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.memory\""
@@ -3193,6 +3194,7 @@ buckets: <
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.memory\""
@@ -6995,6 +6997,7 @@ buckets: <
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.fyi\""
@@ -7019,6 +7022,7 @@ buckets: <
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
+        properties_j: "$build/chromium_tests:{\"bucketed_triggers\":true}"
         properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.mac\""

infra/config/generated/luci-milo.cfg

@@ -10596,26 +10596,11 @@ consoles: <
     category: "chromium|win|dbg"
     short_name: "64"
   >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Win Builder"
-    category: "chromium.win|release|builder"
-    short_name: "32"
-  >
   builders: <
     name: "buildbucket/luci.chromium.ci/Win x64 Builder"
     category: "chromium.win|release|builder"
     short_name: "64"
   >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Win7 (32) Tests"
-    category: "chromium.win|release|tester"
-    short_name: "32"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Win7 Tests (1)"
-    category: "chromium.win|release|tester"
-    short_name: "32"
-  >
   builders: <
     name: "buildbucket/luci.chromium.ci/Win 7 Tests x64 (1)"
     category: "chromium.win|release|tester"
@@ -10626,11 +10611,6 @@ consoles: <
     category: "chromium.win|release|tester"
     short_name: "w10"
   >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Win x64 Builder (dbg)"
-    category: "chromium.win|debug|builder"
-    short_name: "64"
-  >
   builders: <
     name: "buildbucket/luci.chromium.ci/Win Builder (dbg)"
     category: "chromium.win|debug|builder"
@@ -10641,21 +10621,6 @@ consoles: <
     category: "chromium.win|debug|tester"
     short_name: "7"
   >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Win10 Tests x64 (dbg)"
-    category: "chromium.win|debug|tester"
-    short_name: "10"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Windows deterministic"
-    category: "chromium.win|misc"
-    short_name: "det"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/WebKit Win10"
-    category: "chromium.win|misc"
-    short_name: "wbk"
-  >
   builders: <
     name: "buildbucket/luci.chromium.ci/Mac Builder"
     category: "chromium.mac|release"
@@ -10701,11 +10666,6 @@ consoles: <
     category: "chromium.mac|debug"
     short_name: "13"
   >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/ios-device"
-    category: "chromium.mac|ios|default"
-    short_name: "dev"
-  >
   builders: <
     name: "buildbucket/luci.chromium.ci/ios-simulator"
     category: "chromium.mac|ios|default"
@@ -10716,11 +10676,6 @@ consoles: <
     category: "chromium.mac|ios|default"
     short_name: "ful"
   >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/ios-simulator-noncq"
-    category: "chromium.mac|ios|default"
-    short_name: "non"
-  >
   builders: <
     name: "buildbucket/luci.chromium.ci/Linux Builder"
     category: "chromium.linux|release"
@@ -10731,46 +10686,16 @@ consoles: <
     category: "chromium.linux|release"
     short_name: "tst"
   >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Network Service Linux"
-    category: "chromium.linux|release"
-    short_name: "nsl"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/linux-gcc-rel"
-    category: "chromium.linux|release"
-    short_name: "gcc"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Deterministic Linux"
-    category: "chromium.linux|release"
-    short_name: "det"
-  >
   builders: <
     name: "buildbucket/luci.chromium.ci/linux-ozone-rel"
     category: "chromium.linux|release"
     short_name: "ozo"
   >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/linux-trusty-rel"
-    category: "chromium.linux|release"
-    short_name: "tru"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Linux Builder (dbg)(32)"
-    category: "chromium.linux|debug|builder"
-    short_name: "32"
-  >
   builders: <
     name: "buildbucket/luci.chromium.ci/Linux Builder (dbg)"
     category: "chromium.linux|debug|builder"
     short_name: "64"
   >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Deterministic Linux (dbg)"
-    category: "chromium.linux|debug|builder"
-    short_name: "det"
-  >
   builders: <
     name: "buildbucket/luci.chromium.ci/Linux Tests (dbg)(1)"
     category: "chromium.linux|debug|tester"
@@ -10781,11 +10706,6 @@ consoles: <
     category: "chromium.linux|cast"
     short_name: "vid"
   >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Cast Audio Linux"
-    category: "chromium.linux|cast"
-    short_name: "aud"
-  >
   builders: <
     name: "buildbucket/luci.chromium.ci/Fuchsia ARM64"
     category: "chromium.linux|fuchsia|a64"
@@ -10800,21 +10720,11 @@ consoles: <
     category: "chromium.linux|fuchsia|cast"
     short_name: "x64"
   >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Deterministic Fuchsia (dbg)"
-    category: "chromium.linux|fuchsia|x64"
-    short_name: "det"
-  >
   builders: <
     name: "buildbucket/luci.chromium.ci/Fuchsia x64"
     category: "chromium.linux|fuchsia|x64"
     short_name: "rel"
   >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Linux ChromiumOS Full"
-    category: "chromium.chromiumos|default"
-    short_name: "ful"
-  >
   builders: <
     name: "buildbucket/luci.chromium.ci/linux-chromeos-rel"
     category: "chromium.chromiumos|default"
@@ -10825,16 +10735,6 @@ consoles: <
     category: "chromium.chromiumos|default"
     short_name: "dbg"
   >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-asan-rel"
-    category: "chromium.chromiumos|simple|release|x64"
-    short_name: "asn"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-cfi-thin-lto-rel"
-    category: "chromium.chromiumos|simple|release|x64"
-    short_name: "cfi"
-  >
   builders: <
     name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-dbg"
     category: "chromium.chromiumos|simple|debug|x64"
@@ -10845,11 +10745,6 @@ consoles: <
     category: "chromium.chromiumos|simple|release|x64"
     short_name: "rel"
   >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/chromeos-arm-generic-dbg"
-    category: "chromium.chromiumos|simple|debug"
-    short_name: "arm"
-  >
   builders: <
     name: "buildbucket/luci.chromium.ci/chromeos-arm-generic-rel"
     category: "chromium.chromiumos|simple|release"
@@ -11010,21 +10905,6 @@ consoles: <
     category: "chrome"
     short_name: "win"
   >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/win-asan"
-    category: "chromium.memory|win"
-    short_name: "asn"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Mac ASan 64 Builder"
-    category: "chromium.memory|mac"
-    short_name: "bld"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Mac ASan 64 Tests (1)"
-    category: "chromium.memory|mac"
-    short_name: "tst"
-  >
   builders: <
     name: "buildbucket/luci.chromium.ci/Linux TSan Builder"
     category: "chromium.memory|linux|TSan v2"
@@ -11050,61 +10930,6 @@ consoles: <
     category: "chromium.memory|linux|asan lsan"
     short_name: "sbx"
   >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Linux MSan Builder"
-    category: "chromium.memory|linux|msan"
-    short_name: "bld"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Linux MSan Tests"
-    category: "chromium.memory|linux|msan"
-    short_name: "tst"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/WebKit Linux ASAN"
-    category: "chromium.memory|linux|webkit"
-    short_name: "asn"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/WebKit Linux MSAN"
-    category: "chromium.memory|linux|webkit"
-    short_name: "msn"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/WebKit Linux Leak"
-    category: "chromium.memory|linux|webkit"
-    short_name: "lk"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Linux Chromium OS ASan LSan Builder"
-    category: "chromium.memory|cros|asan"
-    short_name: "bld"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Linux Chromium OS ASan LSan Tests (1)"
-    category: "chromium.memory|cros|asan"
-    short_name: "tst"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Linux ChromiumOS MSan Builder"
-    category: "chromium.memory|cros|msan"
-    short_name: "bld"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Linux ChromiumOS MSan Tests"
-    category: "chromium.memory|cros|msan"
-    short_name: "tst"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/android-asan"
-    category: "chromium.memory|android"
-    short_name: "asn"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/Linux CFI"
-    category: "chromium.memory|cfi"
-    short_name: "lnx"
-  >
   builders: <
     name: "buildbucket/luci.chromium.ci/Dawn Linux x64 DEPS Builder"
     category: "chromium.dawn|DEPS|Linux|Builder"
@@ -11165,6 +10990,14 @@ consoles: <
     category: "chromium.dawn|DEPS|Windows|Nvidia"
     short_name: "x64"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.ci/GPU Win x64 Builder"
+    category: "chromium.gpu|Windows"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.ci/Win10 x64 Release (NVIDIA)"
+    category: "chromium.gpu|Windows"
+  >
   builders: <
     name: "buildbucket/luci.chromium.ci/GPU Mac Builder"
     category: "chromium.gpu|Mac"
@@ -11206,6 +11039,11 @@ consoles: <
     name: "buildbucket/luci.chromium.ci/VR Linux"
     category: "chromium.fyi|linux"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.ci/Linux Ozone Tester (Headless)"
+    category: "chromium.fyi|linux"
+    short_name: "loh"
+  >
   builders: <
     name: "buildbucket/luci.chromium.ci/Linux Ozone Tester (Wayland)"
     category: "chromium.fyi|linux"
@@ -11216,6 +11054,10 @@ consoles: <
     category: "chromium.fyi|linux"
     short_name: "lox"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.ci/Win10 Tests x64 1803"
+    category: "chromium.fyi|win10|1803"
+  >
   header: <
     oncalls: <
       name: "Chromium"

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

@@ -260,6 +260,16 @@ ci.fyi_builder(
 )
 
 
+ci.fyi_ios_builder(
+    name = 'ios-simulator-cronet',
+    executable = 'recipe:chromium',
+    notifies = ['cronet'],
+    properties = {
+        'xcode_build_version': '11c29',
+    },
+)
+
+
 ci.fyi_windows_builder(
     name = 'Win10 Tests x64 1803',
     goma_backend = None,
@@ -435,6 +445,11 @@ ci.mac_ios_builder(
     },
 )
 
+ci.mac_ios_builder(
+    name = 'ios-simulator-full-configs',
+    executable = 'recipe:chromium',
+)
+
 
 ci.memory_builder(
     name = 'Linux ASan LSan Builder',
@@ -451,6 +466,15 @@ ci.memory_builder(
     triggered_by = [builder_name('Linux ASan LSan Builder')],
 )
 
+ci.memory_builder(
+    name = 'Linux TSan Builder',
+)
+
+ci.memory_builder(
+    name = 'Linux TSan Tests',
+    triggered_by = [builder_name('Linux TSan Builder')],
+)
+
 
 ci.win_builder(
     name = 'Win7 Tests (dbg)(1)',