Decommission "Win10 FYI x64 Release (Intel UHD 630)"

The Windows Intel pool has had a mix of HD and UHD 630 GPUs for a while
now, so there's no need to specifically test UHD 630 GPUs anymore.

Bug: 1154460
Change-Id: I27d43dc6c74dd332fe7575743bb17007cb30617c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2570124
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Auto-Submit: Brian Sheedy <bsheedy@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#833088}

infra/config/generated/cr-buildbucket.cfg

@@ -12244,53 +12244,6 @@ buckets {
         }
       }
     }
-    builders {
-      name: "Win10 FYI x64 Release (Intel UHD 630)"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "builderless:1"
-      dimensions: "cores:2"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-16.04"
-      dimensions: "pool:luci.chromium.gpu.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/master"
-        cmd: "recipes"
-      }
-      properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.gpu.fyi\",\"perf_dashboard_machine_group\":\"ChromiumGPUFYI\",\"recipe\":\"chromium\"}"
-      execution_timeout_secs: 64800
-      build_numbers: YES
-      service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium.resultdb.result_sink"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "luci-resultdb"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "luci-resultdb"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
-            }
-          }
-        }
-      }
-    }
     builders {
       name: "Win10 FYI x64 Release (NVIDIA GeForce GTX 1660)"
       swarming_host: "chromium-swarm.appspot.com"

infra/config/generated/luci-milo.cfg

@@ -6960,11 +6960,6 @@ consoles {
     category: "Windows|10|x64|Intel"
     short_name: "dqp"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Win10 FYI x64 Release (Intel UHD 630)"
-    category: "Windows|10|x64|Intel"
-    short_name: "uhd"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/Win10 FYI x64 Release (NVIDIA)"
     category: "Windows|10|x64|Nvidia"

infra/config/generated/luci-scheduler.cfg

@@ -3818,20 +3818,6 @@ job {
     builder: "Win10 FYI x64 Release (Intel HD 630)"
   }
 }
-job {
-  id: "Win10 FYI x64 Release (Intel UHD 630)"
-  realm: "ci"
-  acls {
-    role: TRIGGERER
-    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  }
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Win10 FYI x64 Release (Intel UHD 630)"
-  }
-}
 job {
   id: "Win10 FYI x64 Release (NVIDIA GeForce GTX 1660)"
   realm: "ci"

infra/config/subprojects/chromium/ci.star

@@ -3963,18 +3963,6 @@ ci.gpu_fyi_thin_tester(
     triggered_by = ["GPU FYI Win x64 Builder"],
 )
 
-ci.gpu_fyi_thin_tester(
-    name = "Win10 FYI x64 Release (Intel UHD 630)",
-    console_view_entry = ci.console_view_entry(
-        category = "Windows|10|x64|Intel",
-        short_name = "uhd",
-    ),
-    # TODO(https://crbug.com/986939): Remove this increased timeout once
-    # more devices are added.
-    execution_timeout = 18 * time.hour,
-    triggered_by = ["GPU FYI Win x64 Builder"],
-)
-
 ci.gpu_fyi_thin_tester(
     name = "Win10 FYI x64 Release (NVIDIA GeForce GTX 1660)",
     console_view_entry = ci.console_view_entry(

testing/buildbot/mixins.pyl

@@ -911,21 +911,6 @@
       ],
     },
   },
-  'win10_intel_uhd_630_stable': {
-    'swarming': {
-      'dimensions': {
-        'gpu': '8086:3e92-24.20.100.6286',
-        'os': 'Windows-10',
-        'pool': 'chromium.tests.gpu',
-      },
-      # ~50% of the WebGL2 conformance tests time out with the default
-      # 1 hour expiration, but the last shard times out with a 3 hour
-      # expiration, so use 4 hours.
-      # TODO(https://crbug.com/986939): Remove this when more devices
-      # are added.
-      'expiration': 14400,
-    },
-  },
   'win10_nvidia_geforce_gtx_1660': {
     'swarming': {
       'dimensions': {

testing/buildbot/test_suite_exceptions.pyl

@@ -107,11 +107,6 @@
           '--max-processes=1',
         ],
       },
-      'Win10 FYI x64 Release (Intel UHD 630)': {
-        'args': [
-          '--max-processes=1',
-        ],
-      },
     },
   },
   'angle_perftests': {
@@ -157,11 +152,6 @@
           '--max-processes=1',
         ],
       },
-      'Win10 FYI x64 Release (Intel UHD 630)': {
-        'args': [
-          '--max-processes=1',
-        ],
-      },
     },
   },
   'blink_platform_unittests': {
@@ -2444,11 +2434,6 @@
           '--browser=release_x64',
         ],
       },
-      'Win10 FYI x64 Release (Intel UHD 630)': {
-        'args': [
-          '--browser=release_x64',
-        ],
-      },
       'Win10 FYI x64 Release (NVIDIA)': {
         'args': [
           '--browser=release_x64',
@@ -2808,7 +2793,6 @@
       'ANGLE GPU Win10 x64 Release (Intel HD 630)',
       'Optional Win10 x64 Release (Intel HD 630)',
       'Win10 FYI x64 Release (Intel HD 630)',
-      'Win10 FYI x64 Release (Intel UHD 630)',
       'Win10 FYI x64 Exp Release (Intel HD 630)',
     ],
   },

testing/buildbot/waterfalls.pyl

@@ -4383,18 +4383,6 @@
           'gpu_telemetry_tests': 'gpu_fyi_win_intel_release_telemetry_tests',
         },
       },
-      'Win10 FYI x64 Release (Intel UHD 630)': {
-        'os_type': 'win',
-        'browser_config': 'release_x64',
-        'mixins': [
-          'win10_intel_uhd_630_stable',
-        ],
-        'test_suites': {
-          'gtest_tests': 'gpu_fyi_win_gtests',
-          'isolated_scripts': 'gpu_angle_and_desktop_representative_perf_fyi_isolated_scripts',
-          'gpu_telemetry_tests': 'gpu_fyi_win_intel_release_telemetry_tests',
-        },
-      },
       'Win10 FYI x64 Release (NVIDIA GeForce GTX 1660)': {
         # This bot currently only has one piece of hardware behind it,
         # and is being qualified for potential scale-out.