[updater] Run updater testers under chromium.updater buildergroup.

This change propagates changes to waterfall created in
crrev.com/c/2530896.


Bug: 1136981
Change-Id: I69fb6fd9f8c980de9d7373ca02b6a41ce3bd7214
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2531065Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
Commit-Queue: Anjali Doneria <adoneria@google.com>
Cr-Commit-Position: refs/heads/master@{#826529}

infra/config/generated/luci-scheduler.cfg

@@ -5819,16 +5819,6 @@ job {
     builder: "mac-official"
   }
 }
-job {
-  id: "mac-omaha-builder-rel"
-  realm: "ci"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "mac-omaha-builder-rel"
-  }
-}
 job {
   id: "mac-osxbeta-rel"
   realm: "ci"
@@ -5853,6 +5843,16 @@ job {
     builder: "mac-swangle-chromium-x64"
   }
 }
+job {
+  id: "mac-updater-builder-rel"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "mac-updater-builder-rel"
+  }
+}
 job {
   id: "mac-upload-perfetto"
   realm: "ci"
@@ -5865,7 +5865,7 @@ job {
   }
 }
 job {
-  id: "mac10.10-omaha-tester-rel"
+  id: "mac10.10-updater-tester-rel"
   realm: "ci"
   acls {
     role: TRIGGERER
@@ -5875,11 +5875,11 @@ job {
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "mac10.10-omaha-tester-rel"
+    builder: "mac10.10-updater-tester-rel"
   }
 }
 job {
-  id: "mac10.11-omaha-tester-rel"
+  id: "mac10.11-updater-tester-rel"
   realm: "ci"
   acls {
     role: TRIGGERER
@@ -5889,11 +5889,11 @@ job {
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "mac10.11-omaha-tester-rel"
+    builder: "mac10.11-updater-tester-rel"
   }
 }
 job {
-  id: "mac10.12-omaha-tester-rel"
+  id: "mac10.12-updater-tester-rel"
   realm: "ci"
   acls {
     role: TRIGGERER
@@ -5903,11 +5903,11 @@ job {
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "mac10.12-omaha-tester-rel"
+    builder: "mac10.12-updater-tester-rel"
   }
 }
 job {
-  id: "mac10.13-omaha-tester-rel"
+  id: "mac10.13-updater-tester-rel"
   realm: "ci"
   acls {
     role: TRIGGERER
@@ -5917,11 +5917,11 @@ job {
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "mac10.13-omaha-tester-rel"
+    builder: "mac10.13-updater-tester-rel"
   }
 }
 job {
-  id: "mac10.14-omaha-tester-rel"
+  id: "mac10.14-updater-tester-rel"
   realm: "ci"
   acls {
     role: TRIGGERER
@@ -5931,11 +5931,11 @@ job {
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "mac10.14-omaha-tester-rel"
+    builder: "mac10.14-updater-tester-rel"
   }
 }
 job {
-  id: "mac10.15-omaha-tester-rel"
+  id: "mac10.15-updater-tester-rel"
   realm: "ci"
   acls {
     role: TRIGGERER
@@ -5945,7 +5945,7 @@ job {
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "mac10.15-omaha-tester-rel"
+    builder: "mac10.15-updater-tester-rel"
   }
 }
 job {
@@ -6033,16 +6033,6 @@ job {
     builder: "win-official"
   }
 }
-job {
-  id: "win-omaha-builder-rel"
-  realm: "ci"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "win-omaha-builder-rel"
-  }
-}
 job {
   id: "win-paeverywhere-x64-fyi-dbg"
   realm: "ci"
@@ -6177,6 +6167,16 @@ job {
     builder: "win-swangle-x86"
   }
 }
+job {
+  id: "win-updater-builder-rel"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "win-updater-builder-rel"
+  }
+}
 job {
   id: "win-upload-perfetto"
   realm: "ci"
@@ -6209,7 +6209,7 @@ job {
   }
 }
 job {
-  id: "win10-omaha-tester-rel"
+  id: "win10-updater-tester-rel"
   realm: "ci"
   acls {
     role: TRIGGERER
@@ -6219,7 +6219,7 @@ job {
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "win10-omaha-tester-rel"
+    builder: "win10-updater-tester-rel"
   }
 }
 job {
@@ -6283,7 +6283,7 @@ job {
   }
 }
 job {
-  id: "win7-omaha-tester-rel"
+  id: "win7-updater-tester-rel"
   realm: "ci"
   acls {
     role: TRIGGERER
@@ -6293,7 +6293,7 @@ job {
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "win7-omaha-tester-rel"
+    builder: "win7-updater-tester-rel"
   }
 }
 trigger {
@@ -6575,15 +6575,14 @@ trigger {
   triggers: "mac-hermetic-upgrade-rel"
   triggers: "mac-mojo-rel"
   triggers: "mac-official"
-  triggers: "mac-omaha-builder-rel"
   triggers: "mac-swangle-chromium-x64"
+  triggers: "mac-updater-builder-rel"
   triggers: "metadata-exporter"
   triggers: "win-annotator-rel"
   triggers: "win-archive-dbg"
   triggers: "win-archive-rel"
   triggers: "win-asan"
   triggers: "win-official"
-  triggers: "win-omaha-builder-rel"
   triggers: "win-paeverywhere-x64-fyi-dbg"
   triggers: "win-paeverywhere-x64-fyi-rel"
   triggers: "win-paeverywhere-x86-fyi-dbg"
@@ -6596,6 +6595,7 @@ trigger {
   triggers: "win-swangle-tot-swiftshader-x86"
   triggers: "win-swangle-x64"
   triggers: "win-swangle-x86"
+  triggers: "win-updater-builder-rel"
   triggers: "win10-code-coverage"
   triggers: "win10-inverse-fieldtrials-fyi-rel"
   triggers: "win32-archive-dbg"

infra/config/lib/ci.star

@@ -993,6 +993,17 @@ def thin_tester(
         **kwargs
     )
 
+def updater_builder(
+        *,
+        name,
+        **kwargs):
+    return ci.builder(
+        name = name,
+        builder_group = "chromium.updater",
+        goma_backend = builders.goma.backend.RBE_PROD,
+        **kwargs
+    )
+
 def win_builder(
         *,
         name,
@@ -1057,5 +1068,6 @@ ci = struct(
     swangle_mac_builder = swangle_mac_builder,
     swangle_windows_builder = swangle_windows_builder,
     thin_tester = thin_tester,
+    updater_builder = updater_builder,
     win_builder = win_builder,
 )

infra/config/subprojects/chromium/ci.star

@@ -81,6 +81,7 @@ luci.gitiles_poller(
         "chromium.fuzz",
         "chromium.gpu.fyi",
         "chromium.swangle",
+        "chromium.updater",
     ],
 ) for name, title in (
     ("main", settings.main_console_title),
@@ -335,6 +336,10 @@ ci.console_view(
     },
 )
 
+ci.console_view(
+    name = "chromium.updater",
+)
+
 ci.console_view(
     name = "chromium.win",
     branch_selector = branches.STANDARD_MILESTONE,
@@ -2617,8 +2622,8 @@ ci.fyi_builder(
     triggered_by = ["ci/Mac Builder"],
 )
 
-ci.fyi_builder(
-    name = "mac-omaha-builder-rel",
+ci.updater_builder(
+    name = "mac-updater-builder-rel",
     console_view_entry = ci.console_view_entry(
         category = "updater|mac",
         short_name = "bld",
@@ -2629,62 +2634,62 @@ ci.fyi_builder(
     cores = None,
 )
 
-ci.fyi_builder(
-    name = "mac10.10-omaha-tester-rel",
+ci.updater_builder(
+    name = "mac10.10-updater-tester-rel",
     console_view_entry = ci.console_view_entry(
         category = "updater|mac",
         short_name = "10.10",
     ),
-    triggered_by = ["mac-omaha-builder-rel"],
+    triggered_by = ["mac-updater-builder-rel"],
 )
 
-ci.fyi_builder(
-    name = "mac10.11-omaha-tester-rel",
+ci.updater_builder(
+    name = "mac10.11-updater-tester-rel",
     console_view_entry = ci.console_view_entry(
         category = "updater|mac",
         short_name = "10.11",
     ),
-    triggered_by = ["mac-omaha-builder-rel"],
+    triggered_by = ["mac-updater-builder-rel"],
 )
 
-ci.fyi_builder(
-    name = "mac10.12-omaha-tester-rel",
+ci.updater_builder(
+    name = "mac10.12-updater-tester-rel",
     console_view_entry = ci.console_view_entry(
         category = "updater|mac",
         short_name = "10.12",
     ),
-    triggered_by = ["mac-omaha-builder-rel"],
+    triggered_by = ["mac-updater-builder-rel"],
 )
 
-ci.fyi_builder(
-    name = "mac10.13-omaha-tester-rel",
+ci.updater_builder(
+    name = "mac10.13-updater-tester-rel",
     console_view_entry = ci.console_view_entry(
         category = "updater|mac",
         short_name = "10.13",
     ),
-    triggered_by = ["mac-omaha-builder-rel"],
+    triggered_by = ["mac-updater-builder-rel"],
 )
 
-ci.fyi_builder(
-    name = "mac10.14-omaha-tester-rel",
+ci.updater_builder(
+    name = "mac10.14-updater-tester-rel",
     console_view_entry = ci.console_view_entry(
         category = "updater|mac",
         short_name = "10.14",
     ),
-    triggered_by = ["mac-omaha-builder-rel"],
+    triggered_by = ["mac-updater-builder-rel"],
 )
 
-ci.fyi_builder(
-    name = "mac10.15-omaha-tester-rel",
+ci.updater_builder(
+    name = "mac10.15-updater-tester-rel",
     console_view_entry = ci.console_view_entry(
         category = "updater|mac",
         short_name = "10.15",
     ),
-    triggered_by = ["mac-omaha-builder-rel"],
+    triggered_by = ["mac-updater-builder-rel"],
 )
 
-ci.fyi_builder(
-    name = "win-omaha-builder-rel",
+ci.updater_builder(
+    name = "win-updater-builder-rel",
     console_view_entry = ci.console_view_entry(
         category = "updater|win",
         short_name = "bld",
@@ -2693,23 +2698,23 @@ ci.fyi_builder(
     cpu = cpu.X86,
 )
 
-ci.fyi_builder(
-    name = "win7-omaha-tester-rel",
+ci.updater_builder(
+    name = "win7-updater-tester-rel",
     console_view_entry = ci.console_view_entry(
         category = "updater|win",
         short_name = "7",
     ),
-    triggered_by = ["win-omaha-builder-rel"],
+    triggered_by = ["win-updater-builder-rel"],
 )
 
-ci.fyi_builder(
-    name = "win10-omaha-tester-rel",
+ci.updater_builder(
+    name = "win10-updater-tester-rel",
     console_view_entry = ci.console_view_entry(
         category = "updater|win",
         short_name = "10",
     ),
     os = os.WINDOWS_10,
-    triggered_by = ["win-omaha-builder-rel"],
+    triggered_by = ["win-updater-builder-rel"],
 )
 
 ci.fyi_builder(

testing/buildbot/waterfalls.pyl

@@ -2616,24 +2616,6 @@
         },
         'use_swarming': False,
       },
-      'mac10.10-omaha-tester-rel': {
-        'mixins': [
-            'mac_10.10',
-        ],
-        'test_suites': {
-          'gtest_tests': 'updater_gtests',
-	  'isolated_scripts': 'updater_isolated_scripts',
-        },
-      },
-      'mac10.11-omaha-tester-rel': {
-        'mixins': [
-            'mac_10.11',
-        ],
-        'test_suites': {
-          'gtest_tests': 'updater_gtests',
-	  'isolated_scripts': 'updater_isolated_scripts',
-        },
-      },
       'mac10.12-blink-rel-dummy': {
         'test_suites': {
           'isolated_scripts': 'chromium_webkit_isolated_scripts',
@@ -2648,15 +2630,6 @@
           ],
         },
       },
-      'mac10.12-omaha-tester-rel': {
-        'mixins': [
-            'mac_mini_10.12',
-        ],
-        'test_suites': {
-          'gtest_tests': 'updater_gtests',
-	  'isolated_scripts': 'updater_isolated_scripts',
-        },
-      },
       'mac10.13-blink-rel-dummy': {
         'swarming': {
           'dimension_sets': [
@@ -2674,15 +2647,6 @@
           'isolated_scripts': 'chromium_webkit_isolated_scripts',
         },
       },
-      'mac10.13-omaha-tester-rel': {
-        'mixins': [
-            'mac_10.13',
-        ],
-        'test_suites': {
-          'gtest_tests': 'updater_gtests',
-	  'isolated_scripts': 'updater_isolated_scripts',
-        },
-      },
       'mac10.14-blink-rel-dummy': {
         'mixins': [
           'mac_mini_10.14',
@@ -2694,15 +2658,6 @@
           'isolated_scripts': 'chromium_webkit_isolated_scripts',
         },
       },
-      'mac10.14-omaha-tester-rel': {
-        'mixins': [
-            'mac_10.14',
-        ],
-        'test_suites': {
-          'gtest_tests': 'updater_gtests',
-	  'isolated_scripts': 'updater_isolated_scripts',
-        },
-      },
       'mac10.15-blink-rel-dummy': {
         'swarming': {
           'dimension_sets': [
@@ -2720,15 +2675,6 @@
           'isolated_scripts': 'chromium_webkit_isolated_scripts',
         },
       },
-      'mac10.15-omaha-tester-rel': {
-        'mixins': [
-            'mac_10.15',
-        ],
-        'test_suites': {
-          'gtest_tests': 'updater_gtests',
-	  'isolated_scripts': 'updater_isolated_scripts',
-        },
-      },
       'mac11.0-blink-rel-dummy': {
         'mixins': [
             'mac_11.0_beta',
@@ -2829,23 +2775,6 @@
           'gtest_tests': 'chromium_win_gtests',
         },
       },
-      'win10-omaha-tester-rel': {
-        'mixins': [
-          'win10',
-          'x86-64',
-          ],
-        'test_suites': {
-          'gtest_tests': 'updater_gtests',
-          'isolated_scripts': 'updater_isolated_scripts',
-        },
-        'swarming': {
-          'dimension_sets': [
-            {
-              'integrity': 'high',
-            }
-          ]
-        },
-      },
       'win7-blink-rel-dummy': {
         'swarming': {
           'dimension_sets': [
@@ -2859,23 +2788,6 @@
           'isolated_scripts': 'chromium_webkit_isolated_scripts',
         },
       },
-      'win7-omaha-tester-rel': {
-        'mixins': [
-          'win7',
-          'x86-64'
-        ],
-        'test_suites': {
-          'gtest_tests': 'updater_gtests',
-          'isolated_scripts': 'updater_isolated_scripts',
-        },
-        'swarming': {
-          'dimension_sets': [
-            {
-              'integrity': 'high',
-            }
-          ]
-        },
-      },
     },
   },
   {
@@ -5224,6 +5136,100 @@
       },
     },
   },
+  {
+    'name': 'chromium.updater',
+    'mixins': ['chromium-tester-service-account'],
+    'machines': {
+      'mac10.10-updater-tester-rel': {
+        'mixins': [
+            'mac_10.10',
+        ],
+        'test_suites': {
+          'gtest_tests': 'updater_gtests',
+          'isolated_scripts': 'updater_isolated_scripts',
+        },
+      },
+      'mac10.11-updater-tester-rel': {
+        'mixins': [
+            'mac_10.11',
+        ],
+        'test_suites': {
+          'gtest_tests': 'updater_gtests',
+          'isolated_scripts': 'updater_isolated_scripts',
+        },
+      },
+      'mac10.12-updater-tester-rel': {
+        'mixins': [
+            'mac_mini_10.12',
+        ],
+        'test_suites': {
+          'gtest_tests': 'updater_gtests',
+          'isolated_scripts': 'updater_isolated_scripts',
+        },
+      },
+      'mac10.13-updater-tester-rel': {
+        'mixins': [
+            'mac_10.13',
+        ],
+        'test_suites': {
+          'gtest_tests': 'updater_gtests',
+          'isolated_scripts': 'updater_isolated_scripts',
+        },
+      },
+      'mac10.14-updater-tester-rel': {
+        'mixins': [
+            'mac_10.14',
+        ],
+        'test_suites': {
+          'gtest_tests': 'updater_gtests',
+          'isolated_scripts': 'updater_isolated_scripts',
+        },
+      },
+      'mac10.15-updater-tester-rel': {
+        'mixins': [
+            'mac_10.15',
+        ],
+        'test_suites': {
+          'gtest_tests': 'updater_gtests',
+          'isolated_scripts': 'updater_isolated_scripts',
+        },
+      },
+      'win10-updater-tester-rel': {
+        'mixins': [
+          'win10',
+          'x86-64',
+        ],
+        'test_suites': {
+          'gtest_tests': 'updater_gtests',
+          'isolated_scripts': 'updater_isolated_scripts',
+        },
+        'swarming': {
+          'dimension_sets': [
+            {
+              'integrity': 'high',
+            }
+          ]
+        },
+      },
+      'win7-updater-tester-rel': {
+        'mixins': [
+          'win7',
+          'x86-64'
+        ],
+        'test_suites': {
+          'gtest_tests': 'updater_gtests',
+          'isolated_scripts': 'updater_isolated_scripts',
+        },
+        'swarming': {
+          'dimension_sets': [
+            {
+              'integrity': 'high',
+            }
+          ]
+        },
+      },
+    }
+  },
   {
     'name': 'chromium.webrtc',
     'mixins': ['chromium-tester-service-account'],

tools/mb/mb_config.pyl

@@ -311,11 +311,9 @@
       'linux-wpt-payments-fyi-rel': 'release_bot_minimal_symbols',
       'mac-code-coverage': 'clang_code_coverage',
       'mac-hermetic-upgrade-rel': 'release_bot',
-      'mac-omaha-builder-rel': 'updater_release_bot',
       'mac-upload-perfetto': 'release_bot',
       'win-annotator-rel': 'release_bot',
       'win-celab-builder-rel': 'release_bot_minimal_symbols',
-      'win-omaha-builder-rel': 'updater_release_bot',
       'win-paeverywhere-x86-fyi-dbg': 'debug_bot_paeverywhere_x86',
       'win-paeverywhere-x86-fyi-rel': 'release_trybot_paeverywhere_x86',
       'win-paeverywhere-x64-fyi-dbg': 'debug_bot_paeverywhere_x64',
@@ -647,6 +645,11 @@
       'Win V8 FYI Release (NVIDIA)': 'gpu_tests_release_trybot_x86_resource_whitelisting',
     },
 
+    'chromium.updater': {
+      'mac-updater-builder-rel': 'updater_release_bot',
+      'win-updater-builder-rel': 'updater_release_bot',
+    },
+
     # TODO(crbug.com/818301): This master is going away.
     'chromium.webkit': {
       'WebKit Linux Trusty ASAN': 'asan_lsan_release_bot',

tools/mb/mb_config_expectations/chromium.fyi.json

@@ -689,12 +689,6 @@
       "use_goma": true
     }
   },
-  "mac-omaha-builder-rel": {
-    "gn_args": {
-      "is_debug": false,
-      "is_google_branded": true
-    }
-  },
   "mac-upload-perfetto": {
     "gn_args": {
       "is_component_build": false,
@@ -717,12 +711,6 @@
       "use_goma": true
     }
   },
-  "win-omaha-builder-rel": {
-    "gn_args": {
-      "is_debug": false,
-      "is_google_branded": true
-    }
-  },
   "win-paeverywhere-x64-fyi-dbg": {
     "gn_args": {
       "is_component_build": true,

tools/mb/mb_config_expectations/chromium.updater.json

+{
+  "mac-updater-builder-rel": {
+    "gn_args": {
+      "is_debug": false,
+      "is_google_branded": true
+    }
+  },
+  "win-updater-builder-rel": {
+    "gn_args": {
+      "is_debug": false,
+      "is_google_branded": true
+    }
+  }
+}
\ No newline at end of file