Promote Mac10.14 Tests to main waterfall

Mac10.14 Tests is now stable and green, and is ready to be promoted
to the main waterfall alongside its prior-release siblings. This CL
makes a few changes to accomplish that:
1) Updates the OS of the existing main waterfall Mac Builder to 10.14
2) Moves Mac 10.14 Tests to be triggered by Mac Builder
3) Moves it from just master (like all FYI bots) to exist in branch CI
   as well
4) Moves it from FYI to CI consoles

This change leaves Mac Builder Next intact, so that it can be updated
and used for 10.15 soon.

Bug: 1018852
Change-Id: I3d5723ab7c565c37681696acb2f2de79ddcac1f2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2036769
Commit-Queue: Aaron Gable <agable@chromium.org>
Auto-Submit: Aaron Gable <agable@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746074}

infra/config/buckets/ci.star

@@ -1189,13 +1189,6 @@ ci.fyi_mac_builder(
     os = os.MAC_10_14,
 )
 
-ci.fyi_mac_builder(
-    name = 'Mac10.14 Tests',
-    cores = None,
-    os = os.MAC_10_14,
-    triggered_by = ['Mac Builder Next'],
-)
-
 ci.fyi_mac_builder(
     name = 'Mac deterministic',
     cores = None,

infra/config/consoles/chromium.mac.star

@@ -28,6 +28,11 @@ luci.console_view(
             category = 'release',
             short_name = '13',
         ),
+        luci.console_view_entry(
+            builder = 'ci/Mac10.14 Tests',
+            category = 'release',
+            short_name = '14',
+        ),
         luci.console_view_entry(
             builder = 'ci/WebKit Mac10.13 (retina)',
             category = 'release',

infra/config/consoles/main-beta.star

@@ -92,6 +92,11 @@ luci.console_view(
             category = 'chromium.mac|release',
             short_name = '13',
         ),
+        luci.console_view_entry(
+            builder = 'ci-beta/Mac10.14 Tests',
+            category = 'chromium.mac|release',
+            short_name = '14',
+        ),
         luci.console_view_entry(
             builder = 'ci-beta/WebKit Mac10.13 (retina)',
             category = 'chromium.mac|release',

infra/config/consoles/main-stable.star

@@ -68,6 +68,11 @@ luci.console_view(
             category = 'chromium.mac|release',
             short_name = '13',
         ),
+        luci.console_view_entry(
+            builder = 'ci-stable/Mac10.14 Tests',
+            category = 'chromium.mac|release',
+            short_name = '14',
+        ),
         luci.console_view_entry(
             builder = 'ci-stable/WebKit Mac10.13 (retina)',
             category = 'chromium.mac|release',

infra/config/consoles/main.star

@@ -139,6 +139,11 @@ luci.console_view(
             category = 'chromium.mac|release',
             short_name = '13',
         ),
+        luci.console_view_entry(
+            builder = 'ci/Mac10.14 Tests',
+            category = 'chromium.mac|release',
+            short_name = '14',
+        ),
         luci.console_view_entry(
             builder = 'ci/WebKit Mac10.13 (retina)',
             category = 'chromium.mac|release',

infra/config/generated/cr-buildbucket.cfg

@@ -3412,7 +3412,7 @@ buckets: <
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "builder:Mac Builder"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.14"
       recipe: <
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -3960,11 +3960,12 @@ 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\""
+        properties_j: "mastername:\"chromium.mac\""
       >
-      execution_timeout_secs: 36000
+      execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
     >
@@ -8474,7 +8475,7 @@ buckets: <
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "builder:Mac Builder"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.14"
       dimensions: "pool:luci.chromium.ci"
       recipe: <
         name: "chromium"
@@ -8661,6 +8662,27 @@ buckets: <
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "Mac10.14 Tests"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Mac10.14 Tests"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.14"
+      dimensions: "pool:luci.chromium.ci"
+      recipe: <
+        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\""
+      >
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+    >
     builders: <
       name: "WebKit Mac10.13 (retina)"
       swarming_host: "chromium-swarm.appspot.com"
@@ -9339,7 +9361,7 @@ buckets: <
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "builder:Mac Builder"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.13"
+      dimensions: "os:Mac-10.14"
       dimensions: "pool:luci.chromium.ci"
       recipe: <
         name: "chromium"
@@ -9484,6 +9506,27 @@ buckets: <
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "Mac10.14 Tests"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:Mac10.14 Tests"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac-10.14"
+      dimensions: "pool:luci.chromium.ci"
+      recipe: <
+        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\""
+      >
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+    >
     builders: <
       name: "WebKit Mac10.13 (retina)"
       swarming_host: "chromium-swarm.appspot.com"

infra/config/generated/luci-milo.cfg

@@ -7202,6 +7202,11 @@ consoles: <
     category: "release"
     short_name: "13"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.ci/Mac10.14 Tests"
+    category: "release"
+    short_name: "14"
+  >
   builders: <
     name: "buildbucket/luci.chromium.ci/WebKit Mac10.13 (retina)"
     category: "release"
@@ -10614,6 +10619,11 @@ consoles: <
     category: "chromium.mac|release"
     short_name: "13"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.ci/Mac10.14 Tests"
+    category: "chromium.mac|release"
+    short_name: "14"
+  >
   builders: <
     name: "buildbucket/luci.chromium.ci/WebKit Mac10.13 (retina)"
     category: "chromium.mac|release"
@@ -11264,6 +11274,11 @@ consoles: <
     category: "chromium.mac|release"
     short_name: "13"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.ci-beta/Mac10.14 Tests"
+    category: "chromium.mac|release"
+    short_name: "14"
+  >
   builders: <
     name: "buildbucket/luci.chromium.ci-beta/WebKit Mac10.13 (retina)"
     category: "chromium.mac|release"
@@ -11732,6 +11747,11 @@ consoles: <
     category: "chromium.mac|release"
     short_name: "13"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.ci-stable/Mac10.14 Tests"
+    category: "chromium.mac|release"
+    short_name: "14"
+  >
   builders: <
     name: "buildbucket/luci.chromium.ci-stable/WebKit Mac10.13 (retina)"
     category: "chromium.mac|release"

infra/config/generated/luci-scheduler.cfg

@@ -2207,19 +2207,6 @@ job: <
     builder: "Mac deterministic (dbg)"
   >
 >
-job: <
-  id: "Mac10.14 Tests"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Mac10.14 Tests"
-  >
->
 job: <
   id: "Marshmallow 64 bit Tester"
   acls: <
@@ -4154,6 +4141,19 @@ job: <
     builder: "Mac10.13 Tests (dbg)"
   >
 >
+job: <
+  id: "ci-Mac10.14 Tests"
+  acls: <
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  >
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac10.14 Tests"
+  >
+>
 job: <
   id: "ci-WebKit Mac10.13 (retina)"
   acls: <
@@ -4589,6 +4589,19 @@ job: <
     builder: "Mac10.13 Tests (dbg)"
   >
 >
+job: <
+  id: "ci-beta-Mac10.14 Tests"
+  acls: <
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  >
+  acl_sets: "ci-beta"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-beta"
+    builder: "Mac10.14 Tests"
+  >
+>
 job: <
   id: "ci-beta-WebKit Mac10.13 (retina)"
   acls: <
@@ -5056,6 +5069,19 @@ job: <
     builder: "Mac10.13 Tests"
   >
 >
+job: <
+  id: "ci-stable-Mac10.14 Tests"
+  acls: <
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  >
+  acl_sets: "ci-stable"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci-stable"
+    builder: "Mac10.14 Tests"
+  >
+>
 job: <
   id: "ci-stable-WebKit Mac10.13 (retina)"
   acls: <

infra/config/versioned/milestones/m80/buckets/ci.star

@@ -146,6 +146,7 @@ ci.linux_builder(
 
 ci.mac_builder(
     name = 'Mac Builder',
+    os = os.MAC_10_14,
 )
 
 # The build runs on 10.13, but triggers tests on 10.10 bots.
@@ -172,6 +173,12 @@ ci.mac_builder(
     triggered_by = [vars.bucket.builder('Mac Builder')],
 )
 
+ci.mac_builder(
+    name = 'Mac10.14 Tests',
+    os = os.MAC_10_14,
+    triggered_by = [vars.bucket.builder('Mac Builder')],
+)
+
 ci.mac_builder(
     name = 'WebKit Mac10.13 (retina)',
     os = os.MAC_10_13,

infra/config/versioned/milestones/m81/buckets/ci.star

@@ -194,6 +194,7 @@ ci.linux_builder(
 
 ci.mac_builder(
     name = 'Mac Builder',
+    os = os.MAC_10_14,
 )
 
 ci.mac_builder(
@@ -225,6 +226,12 @@ ci.mac_builder(
     triggered_by = [vars.bucket.builder('Mac Builder')],
 )
 
+ci.mac_builder(
+    name = 'Mac10.14 Tests',
+    os = os.MAC_10_14,
+    triggered_by = [vars.bucket.builder('Mac Builder')],
+)
+
 ci.mac_builder(
     name = 'Mac10.13 Tests (dbg)',
     os = os.MAC_ANY,

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

@@ -193,6 +193,7 @@ ci.linux_builder(
 
 ci.mac_builder(
     name = 'Mac Builder',
+    os = os.MAC_10_14,
 )
 
 ci.mac_builder(
@@ -224,6 +225,12 @@ ci.mac_builder(
     triggered_by = [vars.bucket.builder('Mac Builder')],
 )
 
+ci.mac_builder(
+    name = 'Mac10.14 Tests',
+    os = os.MAC_10_14,
+    triggered_by = [vars.bucket.builder('Mac Builder')],
+)
+
 ci.mac_builder(
     name = 'Mac10.13 Tests (dbg)',
     os = os.MAC_ANY,

testing/buildbot/waterfalls.pyl

@@ -1552,17 +1552,6 @@
           'all',
         ],
       },
-      'Mac10.14 Tests': {
-        'mixins': [
-          'mac_10.14',
-          'no_gpu',
-        ],
-        'test_suites': {
-          'gtest_tests': 'chromium_mac_gtests',
-          'isolated_scripts': 'chromium_mac_rel_isolated_scripts',
-          'scripts': 'chromium_mac_scripts',
-        },
-      },
       'Mojo Android': {
         'swarming': {
           'dimension_sets': [
@@ -3956,6 +3945,17 @@
           'scripts': 'chromium_mac_scripts',
         },
       },
+      'Mac10.14 Tests': {
+        'mixins': [
+            'mac_10.14',
+            'no_gpu',
+        ],
+        'test_suites': {
+          'gtest_tests': 'chromium_mac_gtests',
+          'isolated_scripts': 'chromium_mac_rel_isolated_scripts',
+          'scripts': 'chromium_mac_scripts',
+        },
+      },
       'WebKit Mac10.13 (retina)': {
         'test_suites': {
           'isolated_scripts': 'chromium_webkit_isolated_scripts',