Remove build & test configs for old *-google-rel builders.

And update references to them in public consoles.

Bug: 1032272
Change-Id: Ie40e34dd6d9cc9d0025a5361bb62a3ae0b93b96b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1960578Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/master@{#723620}

infra/config/consoles/main.star

@@ -334,22 +334,22 @@ luci.console_view(
             short_name = 'kvn',
         ),
         luci.console_view_entry(
-            builder = 'chrome:ci/linux-chromeos-google-rel',
+            builder = 'chrome:ci/linux-chromeos-chrome',
             category = 'chrome',
             short_name = 'cro',
         ),
         luci.console_view_entry(
-            builder = 'chrome:ci/linux-google-rel',
+            builder = 'chrome:ci/linux-chrome',
             category = 'chrome',
             short_name = 'lnx',
         ),
         luci.console_view_entry(
-            builder = 'chrome:ci/mac-google-rel',
+            builder = 'chrome:ci/mac-chrome',
             category = 'chrome',
             short_name = 'mac',
         ),
         luci.console_view_entry(
-            builder = 'chrome:ci/win-google-rel',
+            builder = 'chrome:ci/win-chrome',
             category = 'chrome',
             short_name = 'win',
         ),

infra/config/generated/luci-milo.cfg

@@ -10511,22 +10511,22 @@ consoles: <
     short_name: "kvn"
   >
   builders: <
-    name: "buildbucket/luci.chrome.ci/linux-chromeos-google-rel"
+    name: "buildbucket/luci.chrome.ci/linux-chromeos-chrome"
     category: "chrome"
     short_name: "cro"
   >
   builders: <
-    name: "buildbucket/luci.chrome.ci/linux-google-rel"
+    name: "buildbucket/luci.chrome.ci/linux-chrome"
     category: "chrome"
     short_name: "lnx"
   >
   builders: <
-    name: "buildbucket/luci.chrome.ci/mac-google-rel"
+    name: "buildbucket/luci.chrome.ci/mac-chrome"
     category: "chrome"
     short_name: "mac"
   >
   builders: <
-    name: "buildbucket/luci.chrome.ci/win-google-rel"
+    name: "buildbucket/luci.chrome.ci/win-chrome"
     category: "chrome"
     short_name: "win"
   >

testing/buildbot/test_suite_exceptions.pyl

@@ -108,13 +108,6 @@
           'shards': 15,
         },
       },
-      'linux-chromeos-google-rel': {
-        # TODO(https://crbug.com/932269): Promote out of experiment when the
-        # tests are green.
-        'args': [
-          '--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.browser_tests.filter',
-        ],
-      },
       'linux-chromeos-chrome': {
         # TODO(https://crbug.com/932269): Promote out of experiment when the
         # tests are green.
@@ -891,12 +884,6 @@
       'Win10 Tests x64 (dbg)': {
         'experiment_percentage': 100,
       },
-      'linux-chromeos-google-rel': {
-        # TODO(crbug.com/970649): Remove this filter.
-        'args': [
-          '--gtest_filter=-SadTabViewInteractiveUITest.ReloadMultipleSadTabs',
-        ],
-      },
       'linux-chromeos-chrome': {
         # TODO(crbug.com/970649): Remove this filter.
         'args': [
@@ -1079,12 +1066,6 @@
           'shards': 2,
         },
       },
-      'chromeos-betty-google-rel': {
-        # TODO(crbug.com/986904): Remove this filter.
-        'args': [
-          '--gtest_filter=-NetworkQualityEstimatorTest.TestTCPSocketRTT',
-        ],
-      },
       'chromeos-betty-chrome': {
         # TODO(crbug.com/986904): Remove this filter.
         'args': [
@@ -1329,13 +1310,6 @@
           'shards': 20,
         },
       },
-      'linux-chromeos-google-rel': {
-        # TODO(https://crbug.com/932269): Promote out of experiment when the
-        # tests are green.
-        'args': [
-          '--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.browser_tests.filter',
-        ],
-      },
       'linux-chromeos-chrome': {
         # TODO(https://crbug.com/932269): Promote out of experiment when the
         # tests are green.
@@ -1423,21 +1397,6 @@
   },
   'ozone_unittests': {
     'modifications': {
-      'chromeos-betty-google-rel': {
-        'args': [
-          '--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.ozone_unittests.filter',
-        ],
-      },
-      'chromeos-betty-pi-arc-google-rel': {
-        'args': [
-          '--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.ozone_unittests.filter',
-        ],
-      },
-      'linux-chromeos-google-rel': {
-        'args': [
-          '--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.ozone_unittests.filter',
-        ],
-      },
       'chromeos-betty-chrome': {
         'args': [
           '--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.ozone_unittests.filter',
@@ -1855,11 +1814,6 @@
           'shards': 2,
         },
       },
-      'linux-chromeos-google-rel': {
-        'args': [
-          '--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.unit_tests.filter',
-        ],
-      },
       'linux-chromeos-chrome': {
         'args': [
           '--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.unit_tests.filter',

testing/buildbot/waterfalls.pyl

@@ -12,8 +12,6 @@
   {
     'name': 'chrome',
     'machines': {
-      # TODO(crbug.com/1032272): Delete all these in favor of their "*-chrome"
-      # counterparts below.
       'chromeos-betty-chrome': {
         'additional_compile_targets': [
           'chromiumos_preflight',
@@ -32,24 +30,6 @@
           ],
         },
       },
-      'chromeos-betty-google-rel': {
-        'additional_compile_targets': [
-          'chromiumos_preflight',
-        ],
-        'test_suites': {
-          'gtest_tests': 'chromeos_vm_gtests',
-          'isolated_scripts': 'chromeos_isolated_scripts',
-        },
-        'swarming': {
-          'dimension_sets': [
-            {
-              'kvm': '1',
-              'os': 'Ubuntu-16.04',
-              'pool': 'chrome.tests.cros-vm',
-            },
-          ],
-        },
-      },
       'chromeos-betty-pi-arc-chrome': {
         'additional_compile_targets': [
           'chromiumos_preflight',
@@ -67,23 +47,6 @@
           ],
         },
       },
-      'chromeos-betty-pi-arc-google-rel': {
-        'additional_compile_targets': [
-          'chromiumos_preflight',
-        ],
-        'test_suites': {
-          'gtest_tests': 'chromeos_browser_integration_tests',
-        },
-        'swarming': {
-          'dimension_sets': [
-            {
-              'kvm': '1',
-              'os': 'Ubuntu-16.04',
-              'pool': 'chrome.tests.cros-vm',
-            },
-          ],
-        },
-      },
       'chromeos-eve-chrome': {
         'additional_compile_targets': [
           'chromiumos_preflight',
@@ -102,24 +65,6 @@
         },
         'os_type': 'chromeos'
       },
-      'chromeos-eve-google-rel': {
-        'additional_compile_targets': [
-          'chromiumos_preflight',
-        ],
-        'test_suites': {
-          'gtest_tests': 'chromeos_device_gtests',
-        },
-        'swarming': {
-          'dimension_sets': [
-            {
-              'os': 'ChromeOS',
-              'device_type': 'eve',
-              'pool': 'luci.chrome.cros-dut',
-            },
-          ],
-        },
-        'os_type': 'chromeos'
-      },
       'chromeos-kevin-chrome': {
         'additional_compile_targets': [
           'chromiumos_preflight',
@@ -138,24 +83,6 @@
         },
         'os_type': 'chromeos'
       },
-      'chromeos-kevin-google-rel': {
-        'additional_compile_targets': [
-          'chromiumos_preflight',
-        ],
-        'test_suites': {
-          'gtest_tests': 'chromeos_device_gtests',
-        },
-        'swarming': {
-          'dimension_sets': [
-            {
-              'os': 'ChromeOS',
-              'device_type': 'kevin',
-              'pool': 'luci.chrome.cros-dut',
-            },
-          ],
-        },
-        'os_type': 'chromeos'
-      },
       'linux-chrome': {
         'additional_compile_targets': [
           'chrome',
@@ -190,40 +117,6 @@
           'gtest_tests': 'linux_chromeos_gtests',
         },
       },
-      'linux-chromeos-google-rel': {
-        'additional_compile_targets': [
-          'chrome',
-          'chrome_sandbox',
-          'linux_symbols',
-          'symupload'
-        ],
-        'mixins': [
-          'chrome-swarming-pool',
-          'linux-xenial',
-        ],
-        'swarming': {
-          'dimension_sets': [
-            {
-              'ssd': '0',
-            },
-          ],
-        },
-        'test_suites': {
-          'gtest_tests': 'linux_chromeos_gtests',
-        },
-      },
-      'linux-google-rel': {
-        'additional_compile_targets': [
-          'chrome',
-          'chrome/installer/linux',
-        ],
-        'mixins': [
-          'chrome-swarming-pool',
-        ],
-        'test_suites': {
-          'isolated_scripts': 'chrome_sizes',
-        },
-      },
       'mac-chrome': {
         'additional_compile_targets': [
           'chrome',
@@ -236,18 +129,6 @@
           'isolated_scripts': 'chrome_sizes',
         },
       },
-      'mac-google-rel': {
-        'additional_compile_targets': [
-          'chrome',
-        ],
-        'mixins': [
-          'chrome-swarming-pool',
-          'mac_10.14',
-        ],
-        'test_suites': {
-          'isolated_scripts': 'chrome_sizes',
-        },
-      },
       'win-chrome': {
         'additional_compile_targets': [
           'chrome',
@@ -261,19 +142,6 @@
           'isolated_scripts': 'chrome_sizes',
         },
       },
-      'win-google-rel': {
-        'additional_compile_targets': [
-          'chrome',
-          'chrome_official_builder',
-        ],
-        'mixins': [
-          'chrome-swarming-pool',
-          'win10',
-        ],
-        'test_suites': {
-          'isolated_scripts': 'chrome_sizes',
-        },
-      },
     },
   },
   {

tools/mb/mb_config.pyl

@@ -14,16 +14,6 @@
   # below). MB uses this dict to look up which config to use for a given bot.
   'masters': {
     'chrome': {
-      # TODO(crbug.com/1032272): Delete all these in favor of their "*-chrome"
-      # counterparts below.
-      'chromeos-betty-google-rel': 'official_cros_chrome_sdk',
-      'chromeos-betty-pi-arc-google-rel': 'official_cros_chrome_sdk',
-      'chromeos-eve-google-rel': 'official_cros_chrome_sdk',
-      'chromeos-kevin-google-rel': 'official_cros_chrome_sdk',
-      'linux-chromeos-google-rel': 'official_goma_chromeos_minimal_symbols',
-      'linux-google-rel': 'official_goma',
-      'mac-google-rel': 'official_goma',
-      'win-google-rel': 'official_goma_x86',
       'chromeos-betty-chrome': 'official_cros_chrome_sdk',
       'chromeos-betty-pi-arc-chrome': 'official_cros_chrome_sdk',
       'chromeos-eve-chrome': 'official_cros_chrome_sdk',