remove Goma GCE Staging builders

- "Chromium Linux Goma GCE Staging"
- "Chromium Mac Goma GCE Staging"
- "CrWinClangGomaGCEStaging"

remove win_clang_release_bot_disable_nacl from mb_config.

Bug: 919752
Change-Id: I24077bf761c8cef26cdd774d228dcc7145e12005
Reviewed-on: https://chromium-review.googlesource.com/c/1404757
Commit-Queue: John Budorick <jbudorick@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Ryan Tseng <hinoka@chromium.org>
Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
Reviewed-by: Shinya Kawanaka <shinyak@chromium.org>
Cr-Commit-Position: refs/heads/master@{#621991}

infra/config/global/cr-buildbucket.cfg

@@ -2546,11 +2546,6 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
       mixins: "goma-ci"
     }
-    builders {
-      name: "Chromium Linux Goma GCE Staging"
-      dimensions: "os:Ubuntu-14.04"
-      mixins: "goma-ci"
-    }
     builders {
       name: "CrWinGomaStaging"
       dimensions: "os:Windows-10"
@@ -2612,18 +2607,6 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
       mixins: "goma-ci"
     }
-    builders {
-      name: "CrWinClangGomaGCEStaging"
-      dimensions: "os:Windows-10"
-      mixins: "goma-ci"
-    }
-    builders {
-      name: "Chromium Mac Goma GCE Staging"
-      dimensions: "os:Mac-10.13"
-      dimensions: "cores:4"
-      mixins: "goma-ci"
-      mixins: "goma-j80"
-    }
     builders {
       name: "Chromium Linux Goma RBE Staging (dbg) (clobber)"
       dimensions: "os:Ubuntu-14.04"

infra/config/global/luci-milo.cfg

@@ -2825,24 +2825,6 @@ consoles {
     category: "clients5"
     short_name: "win"
   }
-  builders {
-    name: "buildbot/chromium.goma/Chromium Linux Goma GCE Staging"
-    name: "buildbucket/luci.chromium.ci/Chromium Linux Goma GCE Staging"
-    category: "gce"
-    short_name: "lnx"
-  }
-  builders {
-    name: "buildbot/chromium.goma/Chromium Mac Goma GCE Staging"
-    name: "buildbucket/luci.chromium.ci/Chromium Mac Goma GCE Staging"
-    category: "gce"
-    short_name: "mac"
-  }
-  builders {
-    name: "buildbot/chromium.goma/CrWinClangGomaGCEStaging"
-    name: "buildbucket/luci.chromium.ci/CrWinClangGomaGCEStaging"
-    category: "gce"
-    short_name: "win"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/Chromium Linux Goma RBE ToT"
     category: "rbe|tot|linux|rel"
@@ -2923,21 +2905,6 @@ consoles {
     category: "clients5"
     short_name: "win"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Chromium Linux Goma GCE Staging"
-    category: "gce"
-    short_name: "lnx"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Chromium Mac Goma GCE Staging"
-    category: "gce"
-    short_name: "mac"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/CrWinClangGomaGCEStaging"
-    category: "gce"
-    short_name: "win"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/Chromium Linux Goma RBE Staging (clobber)"
     category: "rbe|rel"

infra/config/global/luci-scheduler.cfg

@@ -105,7 +105,6 @@ trigger {
   triggers: "Chromium Android ARM 32-bit Goma RBE ToT"
   triggers: "Chromium Android ARM 32-bit Goma RBE Staging"
   triggers: "Chromium Android ARM 32-bit Goma RBE Prod"
-  triggers: "Chromium Linux Goma GCE Staging"
   triggers: "Chromium Linux Goma RBE Prod"
   triggers: "Chromium Linux Goma RBE Staging (clobber)"
   triggers: "Chromium Linux Goma RBE Staging (dbg) (clobber)"
@@ -114,7 +113,6 @@ trigger {
   triggers: "Chromium Linux Goma RBE ToT"
   triggers: "Chromium Linux Goma Staging"
   triggers: "Chromium Mac 10.13"
-  triggers: "Chromium Mac Goma GCE Staging"
   triggers: "Chromium Mac Goma RBE Staging (clobber)"
   triggers: "Chromium Mac Goma RBE Staging (dbg)"
   triggers: "Chromium Mac Goma RBE Staging"
@@ -125,7 +123,6 @@ trigger {
   triggers: "CrWinAsan"
   triggers: "CrWinAsan(dll)"
   triggers: "CrWinAsanCov"
-  triggers: "CrWinClangGomaGCEStaging"
   triggers: "CrWinGomaStaging"
   triggers: "Deterministic Android (dbg)"
   triggers: "Deterministic Android"
@@ -4409,16 +4406,6 @@ job {
   }
 }
 
-job {
-  id: "Chromium Linux Goma GCE Staging"
-  acl_sets: "default"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Chromium Linux Goma GCE Staging"
-  }
-}
-
 job {
   id: "Chromium Android ARM 32-bit Goma RBE ToT"
   acl_sets: "default"
@@ -4519,16 +4506,6 @@ job {
   }
 }
 
-job {
-  id: "Chromium Mac Goma GCE Staging"
-  acl_sets: "default"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Chromium Mac Goma GCE Staging"
-  }
-}
-
 job {
   id: "Chromium Mac Goma RBE Staging (clobber)"
   acl_sets: "default"
@@ -4569,16 +4546,6 @@ job {
   }
 }
 
-job {
-  id: "CrWinClangGomaGCEStaging"
-  acl_sets: "default"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "CrWinClangGomaGCEStaging"
-  }
-}
-
 job {
   id: "CrWinGomaStaging"
   acl_sets: "default"

testing/buildbot/chromium.goma.json

 {
   "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
   "AAAAA2 See generate_buildbot_json.py to make changes": {},
-  "Chromium Linux Goma GCE Staging": {
-    "additional_compile_targets": [
-      "all"
-    ],
-    "gtest_tests": [
-      {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "base_unittests"
-      },
-      {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "content_unittests"
-      }
-    ]
-  },
   "Chromium Linux Goma RBE Staging": {
     "additional_compile_targets": [
       "all"
@@ -115,25 +96,6 @@
       }
     ]
   },
-  "Chromium Mac Goma GCE Staging": {
-    "additional_compile_targets": [
-      "chrome"
-    ],
-    "gtest_tests": [
-      {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "base_unittests"
-      },
-      {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "content_unittests"
-      }
-    ]
-  },
   "Chromium Mac Goma RBE Staging": {
     "additional_compile_targets": [
       "chrome"
@@ -210,25 +172,6 @@
       }
     ]
   },
-  "CrWinClangGomaGCEStaging": {
-    "additional_compile_targets": [
-      "all"
-    ],
-    "gtest_tests": [
-      {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "base_unittests"
-      },
-      {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "content_unittests"
-      }
-    ]
-  },
   "CrWinGomaStaging": {
     "additional_compile_targets": [
       "all"

testing/buildbot/waterfalls.pyl

@@ -1677,14 +1677,6 @@
   {
     'name': 'chromium.goma',
     'machines': {
-      'Chromium Linux Goma GCE Staging': {
-        'additional_compile_targets': [
-          'all',
-        ],
-        'test_suites': {
-          'gtest_tests': 'goma_gtests',
-        },
-      },
       'Chromium Linux Goma RBE Staging': {
         'additional_compile_targets': [
           'all',
@@ -1725,16 +1717,6 @@
           'gtest_tests': 'goma_gtests',
         },
       },
-      'Chromium Mac Goma GCE Staging': {
-        'additional_compile_targets': [
-          # Due to disk shortage, we build 'chrome' instead of 'all'.
-          # See crbug.com/899425
-          'chrome',
-        ],
-        'test_suites': {
-          'gtest_tests': 'goma_gtests',
-        },
-      },
       'Chromium Mac Goma RBE Staging': {
         'additional_compile_targets': [
           # Due to disk shortage, we build 'chrome' instead of 'all'.
@@ -1773,14 +1755,6 @@
           'gtest_tests': 'goma_gtests',
         },
       },
-      'CrWinClangGomaGCEStaging': {
-        'additional_compile_targets': [
-          'all',
-        ],
-        'test_suites': {
-          'gtest_tests': 'goma_gtests',
-        },
-      },
       'CrWinGomaStaging': {
         'additional_compile_targets': [
           'all',

tools/mb/mb_config.pyl

@@ -297,9 +297,6 @@
       'Chromium Linux Goma Staging': 'release_bot',
       'Chromium Mac Goma Staging': 'release_bot',
       'CrWinGomaStaging': 'release_bot_x86_minimal_symbols',
-      'Chromium Linux Goma GCE Staging': 'release_bot',
-      'Chromium Mac Goma GCE Staging': 'release_bot',
-      'CrWinClangGomaGCEStaging': 'win_clang_release_bot_disable_nacl',
       'Chromium Linux Goma RBE ToT': 'release_bot',
       'Chromium Linux Goma RBE Staging (clobber)': 'release_bot',
       'Chromium Linux Goma RBE Staging': 'release_bot',
@@ -1788,11 +1785,6 @@
       'no_clang', 'release_bot',
     ],
 
-    # TODO(tikuta): Remove this once gcp goma backend supports all windows nacl compilers.
-    'win_clang_release_bot_disable_nacl': [
-      'clang', 'release_bot', 'minimal_symbols', 'disable_nacl',
-    ],
-
     'clang_tot_win_release_cross': [
       'clang_tot', 'win_cross', 'minimal_symbols', 'shared', 'release', 'dcheck_always_on',
     ],