Remove Win/x86/rel infra/specs entries

Removes all infra/specs entries for builders related to
dawn-win-x86-builder-rel since they have been migrated to use
Starlark-generated test specs.

Bug: 485816035
Change-Id: Ic499082b87360ec72f59b09d56dc29bb49e4f0ff
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/295395
Commit-Queue: Brian Sheedy <bsheedy@google.com>
Reviewed-by: Jonathan Lee <jonathanjlee@google.com>
diff --git a/infra/specs/ci.json b/infra/specs/ci.json
index a082f21..2c1155a 100644
--- a/infra/specs/ci.json
+++ b/infra/specs/ci.json
@@ -1585,571 +1585,6 @@
       "default"
     ]
   },
-  "dawn-win-x86-builder-rel": {
-    "additional_compile_targets": [
-      "default"
-    ]
-  },
-  "dawn-win-x86-intel-uhd630-rel": {
-    "gtest_tests": [
-      {
-        "args": [
-          "--check-capture-replay",
-          "--use-gpu-in-tests",
-          "--exclusive-device-type-preference=discrete,integrated",
-          "--test-launcher-retry-limit=0",
-          "--test-launcher-batch-limit=512",
-          "--gtest_filter=-*WebGPU_WebGPU_backend_on*"
-        ],
-        "merge": {
-          "script": "//scripts/merge_scripts/true_noop_merge.py"
-        },
-        "module_name": "//src/dawn/tests:dawn_end2end_tests",
-        "name": "dawn_end2end_capture_replay_tests",
-        "resultdb": {
-          "result_format": "gtest_json"
-        },
-        "swarming": {
-          "containment_type": "AUTO",
-          "dimensions": {
-            "display_attached": "1",
-            "gpu": "8086:9bc5-31.0.101.2127",
-            "os": "Windows-10",
-            "pool": "chromium.tests.gpu"
-          },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 2
-        },
-        "test": "dawn_end2end_tests",
-        "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/"
-      },
-      {
-        "args": [
-          "--enable-implicit-device-sync",
-          "--use-gpu-in-tests",
-          "--exclusive-device-type-preference=discrete,integrated",
-          "--test-launcher-retry-limit=0",
-          "--test-launcher-batch-limit=512",
-          "--gtest_filter=-*WebGPU_WebGPU_backend_on*"
-        ],
-        "merge": {
-          "script": "//scripts/merge_scripts/true_noop_merge.py"
-        },
-        "module_name": "//src/dawn/tests:dawn_end2end_tests",
-        "name": "dawn_end2end_implicit_sync_tests",
-        "resultdb": {
-          "result_format": "gtest_json"
-        },
-        "swarming": {
-          "containment_type": "AUTO",
-          "dimensions": {
-            "display_attached": "1",
-            "gpu": "8086:9bc5-31.0.101.2127",
-            "os": "Windows-10",
-            "pool": "chromium.tests.gpu"
-          },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 2
-        },
-        "test": "dawn_end2end_tests",
-        "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/"
-      },
-      {
-        "args": [
-          "--disable-toggles=use_dxc",
-          "--use-gpu-in-tests",
-          "--exclusive-device-type-preference=discrete,integrated",
-          "--test-launcher-retry-limit=0",
-          "--test-launcher-batch-limit=512",
-          "--gtest_filter=-*WebGPU_WebGPU_backend_on*"
-        ],
-        "merge": {
-          "script": "//scripts/merge_scripts/true_noop_merge.py"
-        },
-        "module_name": "//src/dawn/tests:dawn_end2end_tests",
-        "name": "dawn_end2end_no_dxc_tests",
-        "resultdb": {
-          "result_format": "gtest_json"
-        },
-        "swarming": {
-          "containment_type": "AUTO",
-          "dimensions": {
-            "display_attached": "1",
-            "gpu": "8086:9bc5-31.0.101.2127",
-            "os": "Windows-10",
-            "pool": "chromium.tests.gpu"
-          },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 2
-        },
-        "test": "dawn_end2end_tests",
-        "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/"
-      },
-      {
-        "args": [
-          "--disable-toggles=use_dxc",
-          "--enable-backend-validation",
-          "--use-gpu-in-tests",
-          "--exclusive-device-type-preference=discrete,integrated",
-          "--test-launcher-retry-limit=0",
-          "--test-launcher-batch-limit=512",
-          "--gtest_filter=-*WebGPU_WebGPU_backend_on*"
-        ],
-        "merge": {
-          "script": "//scripts/merge_scripts/true_noop_merge.py"
-        },
-        "module_name": "//src/dawn/tests:dawn_end2end_tests",
-        "name": "dawn_end2end_no_dxc_validation_layers_tests",
-        "resultdb": {
-          "result_format": "gtest_json"
-        },
-        "swarming": {
-          "containment_type": "AUTO",
-          "dimensions": {
-            "display_attached": "1",
-            "gpu": "8086:9bc5-31.0.101.2127",
-            "os": "Windows-10",
-            "pool": "chromium.tests.gpu"
-          },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 3
-        },
-        "test": "dawn_end2end_tests",
-        "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/"
-      },
-      {
-        "args": [
-          "--enable-toggles=skip_validation",
-          "--use-gpu-in-tests",
-          "--exclusive-device-type-preference=discrete,integrated",
-          "--test-launcher-retry-limit=0",
-          "--test-launcher-batch-limit=512",
-          "--gtest_filter=-*WebGPU_WebGPU_backend_on*"
-        ],
-        "merge": {
-          "script": "//scripts/merge_scripts/true_noop_merge.py"
-        },
-        "module_name": "//src/dawn/tests:dawn_end2end_tests",
-        "name": "dawn_end2end_skip_validation_tests",
-        "resultdb": {
-          "result_format": "gtest_json"
-        },
-        "swarming": {
-          "containment_type": "AUTO",
-          "dimensions": {
-            "display_attached": "1",
-            "gpu": "8086:9bc5-31.0.101.2127",
-            "os": "Windows-10",
-            "pool": "chromium.tests.gpu"
-          },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 2
-        },
-        "test": "dawn_end2end_tests",
-        "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/"
-      },
-      {
-        "args": [
-          "--use-gpu-in-tests",
-          "--exclusive-device-type-preference=discrete,integrated",
-          "--test-launcher-retry-limit=0",
-          "--test-launcher-batch-limit=512",
-          "--gtest_filter=-*WebGPU_WebGPU_backend_on*"
-        ],
-        "merge": {
-          "script": "//scripts/merge_scripts/true_noop_merge.py"
-        },
-        "module_name": "//src/dawn/tests:dawn_end2end_tests",
-        "name": "dawn_end2end_tests",
-        "resultdb": {
-          "result_format": "gtest_json"
-        },
-        "swarming": {
-          "containment_type": "AUTO",
-          "dimensions": {
-            "display_attached": "1",
-            "gpu": "8086:9bc5-31.0.101.2127",
-            "os": "Windows-10",
-            "pool": "chromium.tests.gpu"
-          },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 2
-        },
-        "test": "dawn_end2end_tests",
-        "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/"
-      },
-      {
-        "args": [
-          "--enable-backend-validation",
-          "--use-gpu-in-tests",
-          "--exclusive-device-type-preference=discrete,integrated",
-          "--test-launcher-retry-limit=0",
-          "--test-launcher-batch-limit=512",
-          "--gtest_filter=-*WebGPU_WebGPU_backend_on*"
-        ],
-        "merge": {
-          "script": "//scripts/merge_scripts/true_noop_merge.py"
-        },
-        "module_name": "//src/dawn/tests:dawn_end2end_tests",
-        "name": "dawn_end2end_validation_layers_tests",
-        "resultdb": {
-          "result_format": "gtest_json"
-        },
-        "swarming": {
-          "containment_type": "AUTO",
-          "dimensions": {
-            "display_attached": "1",
-            "gpu": "8086:9bc5-31.0.101.2127",
-            "os": "Windows-10",
-            "pool": "chromium.tests.gpu"
-          },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 3
-        },
-        "test": "dawn_end2end_tests",
-        "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/"
-      },
-      {
-        "args": [
-          "--use-wire",
-          "--use-gpu-in-tests",
-          "--exclusive-device-type-preference=discrete,integrated",
-          "--test-launcher-retry-limit=0",
-          "--test-launcher-batch-limit=512",
-          "--gtest_filter=-*WebGPU_WebGPU_backend_on*"
-        ],
-        "merge": {
-          "script": "//scripts/merge_scripts/true_noop_merge.py"
-        },
-        "module_name": "//src/dawn/tests:dawn_end2end_tests",
-        "name": "dawn_end2end_wire_tests",
-        "resultdb": {
-          "result_format": "gtest_json"
-        },
-        "swarming": {
-          "containment_type": "AUTO",
-          "dimensions": {
-            "display_attached": "1",
-            "gpu": "8086:9bc5-31.0.101.2127",
-            "os": "Windows-10",
-            "pool": "chromium.tests.gpu"
-          },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 2
-        },
-        "test": "dawn_end2end_tests",
-        "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/"
-      },
-      {
-        "args": [
-          "--test-launcher-print-test-stdio=always",
-          "--test-launcher-jobs=1",
-          "--test-launcher-retry-limit=0",
-          "--override-steps=1"
-        ],
-        "merge": {
-          "script": "//scripts/merge_scripts/true_noop_merge.py"
-        },
-        "module_name": "//src/dawn/tests:dawn_perf_tests",
-        "name": "dawn_perf_tests",
-        "resultdb": {
-          "result_format": "gtest_json"
-        },
-        "swarming": {
-          "containment_type": "AUTO",
-          "dimensions": {
-            "display_attached": "1",
-            "gpu": "8086:9bc5-31.0.101.2127",
-            "os": "Windows-10",
-            "pool": "chromium.tests.gpu"
-          },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
-        },
-        "test": "dawn_perf_tests",
-        "test_id_prefix": "ninja://src/dawn/tests:dawn_perf_tests/"
-      }
-    ]
-  },
-  "dawn-win-x86-nvidia-gtx1660-rel": {
-    "gtest_tests": [
-      {
-        "args": [
-          "--check-capture-replay",
-          "--use-gpu-in-tests",
-          "--exclusive-device-type-preference=discrete,integrated",
-          "--test-launcher-retry-limit=0",
-          "--test-launcher-batch-limit=512",
-          "--gtest_filter=-*WebGPU_WebGPU_backend_on*"
-        ],
-        "merge": {
-          "script": "//scripts/merge_scripts/true_noop_merge.py"
-        },
-        "module_name": "//src/dawn/tests:dawn_end2end_tests",
-        "name": "dawn_end2end_capture_replay_tests",
-        "resultdb": {
-          "result_format": "gtest_json"
-        },
-        "swarming": {
-          "containment_type": "AUTO",
-          "dimensions": {
-            "display_attached": "1",
-            "gpu": "10de:2184-31.0.15.4601",
-            "os": "Windows-10-19045",
-            "pool": "chromium.tests.gpu"
-          },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 2
-        },
-        "test": "dawn_end2end_tests",
-        "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/"
-      },
-      {
-        "args": [
-          "--enable-implicit-device-sync",
-          "--use-gpu-in-tests",
-          "--exclusive-device-type-preference=discrete,integrated",
-          "--test-launcher-retry-limit=0",
-          "--test-launcher-batch-limit=512",
-          "--gtest_filter=-*WebGPU_WebGPU_backend_on*"
-        ],
-        "merge": {
-          "script": "//scripts/merge_scripts/true_noop_merge.py"
-        },
-        "module_name": "//src/dawn/tests:dawn_end2end_tests",
-        "name": "dawn_end2end_implicit_sync_tests",
-        "resultdb": {
-          "result_format": "gtest_json"
-        },
-        "swarming": {
-          "containment_type": "AUTO",
-          "dimensions": {
-            "display_attached": "1",
-            "gpu": "10de:2184-31.0.15.4601",
-            "os": "Windows-10-19045",
-            "pool": "chromium.tests.gpu"
-          },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 2
-        },
-        "test": "dawn_end2end_tests",
-        "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/"
-      },
-      {
-        "args": [
-          "--disable-toggles=use_dxc",
-          "--use-gpu-in-tests",
-          "--exclusive-device-type-preference=discrete,integrated",
-          "--test-launcher-retry-limit=0",
-          "--test-launcher-batch-limit=512",
-          "--gtest_filter=-*WebGPU_WebGPU_backend_on*"
-        ],
-        "merge": {
-          "script": "//scripts/merge_scripts/true_noop_merge.py"
-        },
-        "module_name": "//src/dawn/tests:dawn_end2end_tests",
-        "name": "dawn_end2end_no_dxc_tests",
-        "resultdb": {
-          "result_format": "gtest_json"
-        },
-        "swarming": {
-          "containment_type": "AUTO",
-          "dimensions": {
-            "display_attached": "1",
-            "gpu": "10de:2184-31.0.15.4601",
-            "os": "Windows-10-19045",
-            "pool": "chromium.tests.gpu"
-          },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 2
-        },
-        "test": "dawn_end2end_tests",
-        "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/"
-      },
-      {
-        "args": [
-          "--disable-toggles=use_dxc",
-          "--enable-backend-validation",
-          "--use-gpu-in-tests",
-          "--exclusive-device-type-preference=discrete,integrated",
-          "--test-launcher-retry-limit=0",
-          "--test-launcher-batch-limit=512",
-          "--gtest_filter=-*WebGPU_WebGPU_backend_on*"
-        ],
-        "merge": {
-          "script": "//scripts/merge_scripts/true_noop_merge.py"
-        },
-        "module_name": "//src/dawn/tests:dawn_end2end_tests",
-        "name": "dawn_end2end_no_dxc_validation_layers_tests",
-        "resultdb": {
-          "result_format": "gtest_json"
-        },
-        "swarming": {
-          "containment_type": "AUTO",
-          "dimensions": {
-            "display_attached": "1",
-            "gpu": "10de:2184-31.0.15.4601",
-            "os": "Windows-10-19045",
-            "pool": "chromium.tests.gpu"
-          },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 3
-        },
-        "test": "dawn_end2end_tests",
-        "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/"
-      },
-      {
-        "args": [
-          "--enable-toggles=skip_validation",
-          "--use-gpu-in-tests",
-          "--exclusive-device-type-preference=discrete,integrated",
-          "--test-launcher-retry-limit=0",
-          "--test-launcher-batch-limit=512",
-          "--gtest_filter=-*WebGPU_WebGPU_backend_on*"
-        ],
-        "merge": {
-          "script": "//scripts/merge_scripts/true_noop_merge.py"
-        },
-        "module_name": "//src/dawn/tests:dawn_end2end_tests",
-        "name": "dawn_end2end_skip_validation_tests",
-        "resultdb": {
-          "result_format": "gtest_json"
-        },
-        "swarming": {
-          "containment_type": "AUTO",
-          "dimensions": {
-            "display_attached": "1",
-            "gpu": "10de:2184-31.0.15.4601",
-            "os": "Windows-10-19045",
-            "pool": "chromium.tests.gpu"
-          },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 2
-        },
-        "test": "dawn_end2end_tests",
-        "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/"
-      },
-      {
-        "args": [
-          "--use-gpu-in-tests",
-          "--exclusive-device-type-preference=discrete,integrated",
-          "--test-launcher-retry-limit=0",
-          "--test-launcher-batch-limit=512",
-          "--gtest_filter=-*WebGPU_WebGPU_backend_on*"
-        ],
-        "merge": {
-          "script": "//scripts/merge_scripts/true_noop_merge.py"
-        },
-        "module_name": "//src/dawn/tests:dawn_end2end_tests",
-        "name": "dawn_end2end_tests",
-        "resultdb": {
-          "result_format": "gtest_json"
-        },
-        "swarming": {
-          "containment_type": "AUTO",
-          "dimensions": {
-            "display_attached": "1",
-            "gpu": "10de:2184-31.0.15.4601",
-            "os": "Windows-10-19045",
-            "pool": "chromium.tests.gpu"
-          },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 2
-        },
-        "test": "dawn_end2end_tests",
-        "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/"
-      },
-      {
-        "args": [
-          "--enable-backend-validation",
-          "--use-gpu-in-tests",
-          "--exclusive-device-type-preference=discrete,integrated",
-          "--test-launcher-retry-limit=0",
-          "--test-launcher-batch-limit=512",
-          "--gtest_filter=-*WebGPU_WebGPU_backend_on*"
-        ],
-        "merge": {
-          "script": "//scripts/merge_scripts/true_noop_merge.py"
-        },
-        "module_name": "//src/dawn/tests:dawn_end2end_tests",
-        "name": "dawn_end2end_validation_layers_tests",
-        "resultdb": {
-          "result_format": "gtest_json"
-        },
-        "swarming": {
-          "containment_type": "AUTO",
-          "dimensions": {
-            "display_attached": "1",
-            "gpu": "10de:2184-31.0.15.4601",
-            "os": "Windows-10-19045",
-            "pool": "chromium.tests.gpu"
-          },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 3
-        },
-        "test": "dawn_end2end_tests",
-        "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/"
-      },
-      {
-        "args": [
-          "--use-wire",
-          "--use-gpu-in-tests",
-          "--exclusive-device-type-preference=discrete,integrated",
-          "--test-launcher-retry-limit=0",
-          "--test-launcher-batch-limit=512",
-          "--gtest_filter=-*WebGPU_WebGPU_backend_on*"
-        ],
-        "merge": {
-          "script": "//scripts/merge_scripts/true_noop_merge.py"
-        },
-        "module_name": "//src/dawn/tests:dawn_end2end_tests",
-        "name": "dawn_end2end_wire_tests",
-        "resultdb": {
-          "result_format": "gtest_json"
-        },
-        "swarming": {
-          "containment_type": "AUTO",
-          "dimensions": {
-            "display_attached": "1",
-            "gpu": "10de:2184-31.0.15.4601",
-            "os": "Windows-10-19045",
-            "pool": "chromium.tests.gpu"
-          },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 2
-        },
-        "test": "dawn_end2end_tests",
-        "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/"
-      },
-      {
-        "args": [
-          "--test-launcher-print-test-stdio=always",
-          "--test-launcher-jobs=1",
-          "--test-launcher-retry-limit=0",
-          "--override-steps=1"
-        ],
-        "merge": {
-          "script": "//scripts/merge_scripts/true_noop_merge.py"
-        },
-        "module_name": "//src/dawn/tests:dawn_perf_tests",
-        "name": "dawn_perf_tests",
-        "resultdb": {
-          "result_format": "gtest_json"
-        },
-        "swarming": {
-          "containment_type": "AUTO",
-          "dimensions": {
-            "display_attached": "1",
-            "gpu": "10de:2184-31.0.15.4601",
-            "os": "Windows-10-19045",
-            "pool": "chromium.tests.gpu"
-          },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
-        },
-        "test": "dawn_perf_tests",
-        "test_id_prefix": "ninja://src/dawn/tests:dawn_perf_tests/"
-      }
-    ]
-  },
   "dawn-win-x86-sws-dbg": {
     "gtest_tests": [
       {
@@ -2302,158 +1737,5 @@
         "test_id_prefix": "ninja://src/tint/cmd/test:tint_unittests/"
       }
     ]
-  },
-  "dawn-win-x86-sws-rel": {
-    "gtest_tests": [
-      {
-        "args": [
-          "--backend=opengles",
-          "--use-angle=swiftshader",
-          "--enable-toggles=gl_force_es_31_and_no_extensions"
-        ],
-        "merge": {
-          "script": "//scripts/merge_scripts/true_noop_merge.py"
-        },
-        "module_name": "//src/dawn/tests:dawn_end2end_tests",
-        "name": "dawn_end2end_swangle_tests",
-        "resultdb": {
-          "result_format": "gtest_json"
-        },
-        "swarming": {
-          "containment_type": "AUTO",
-          "dimensions": {
-            "cpu": "x86-64",
-            "gpu": "none",
-            "os": "Windows-10",
-            "pool": "chromium.tests.gpu"
-          },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 2
-        },
-        "test": "dawn_end2end_tests",
-        "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/"
-      },
-      {
-        "args": [
-          "--adapter-vendor-id=0x1AE0"
-        ],
-        "merge": {
-          "script": "//scripts/merge_scripts/true_noop_merge.py"
-        },
-        "module_name": "//src/dawn/tests:dawn_end2end_tests",
-        "name": "dawn_end2end_sws_tests",
-        "resultdb": {
-          "result_format": "gtest_json"
-        },
-        "swarming": {
-          "containment_type": "AUTO",
-          "dimensions": {
-            "cpu": "x86-64",
-            "gpu": "none",
-            "os": "Windows-10",
-            "pool": "chromium.tests.gpu"
-          },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 3
-        },
-        "test": "dawn_end2end_tests",
-        "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/"
-      },
-      {
-        "args": [
-          "--adapter-vendor-id=0x1414"
-        ],
-        "merge": {
-          "script": "//scripts/merge_scripts/true_noop_merge.py"
-        },
-        "module_name": "//src/dawn/tests:dawn_end2end_tests",
-        "name": "dawn_end2end_warp_tests",
-        "resultdb": {
-          "result_format": "gtest_json"
-        },
-        "swarming": {
-          "containment_type": "AUTO",
-          "dimensions": {
-            "cpu": "x86-64",
-            "gpu": "none",
-            "os": "Windows-10",
-            "pool": "chromium.tests.gpu"
-          },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 6
-        },
-        "test": "dawn_end2end_tests",
-        "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/"
-      },
-      {
-        "merge": {
-          "script": "//scripts/merge_scripts/true_noop_merge.py"
-        },
-        "module_name": "//src/dawn/tests:dawn_unittests",
-        "name": "dawn_unittests",
-        "resultdb": {
-          "result_format": "gtest_json"
-        },
-        "swarming": {
-          "containment_type": "AUTO",
-          "dimensions": {
-            "cpu": "x86-64",
-            "gpu": "none",
-            "os": "Windows-10",
-            "pool": "chromium.tests.gpu"
-          },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
-        },
-        "test": "dawn_unittests",
-        "test_id_prefix": "ninja://src/dawn/tests:dawn_unittests/"
-      },
-      {
-        "args": [
-          "--use-wire"
-        ],
-        "merge": {
-          "script": "//scripts/merge_scripts/true_noop_merge.py"
-        },
-        "module_name": "//src/dawn/tests:dawn_unittests",
-        "name": "dawn_wire_unittests",
-        "resultdb": {
-          "result_format": "gtest_json"
-        },
-        "swarming": {
-          "containment_type": "AUTO",
-          "dimensions": {
-            "cpu": "x86-64",
-            "gpu": "none",
-            "os": "Windows-10",
-            "pool": "chromium.tests.gpu"
-          },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
-        },
-        "test": "dawn_unittests",
-        "test_id_prefix": "ninja://src/dawn/tests:dawn_unittests/"
-      },
-      {
-        "merge": {
-          "script": "//scripts/merge_scripts/true_noop_merge.py"
-        },
-        "module_name": "//src/tint/cmd/test:tint_unittests",
-        "name": "tint_unittests",
-        "resultdb": {
-          "result_format": "gtest_json"
-        },
-        "swarming": {
-          "containment_type": "AUTO",
-          "dimensions": {
-            "cpu": "x86-64",
-            "gpu": "none",
-            "os": "Windows-10",
-            "pool": "chromium.tests.gpu"
-          },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
-        },
-        "test": "tint_unittests",
-        "test_id_prefix": "ninja://src/tint/cmd/test:tint_unittests/"
-      }
-    ]
   }
 }
diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl
index a62dc5b..86bafab 100644
--- a/infra/specs/waterfalls.pyl
+++ b/infra/specs/waterfalls.pyl
@@ -121,29 +121,6 @@
           'default',
         ],
       },
-      'dawn-win-x86-builder-rel': {
-        'additional_compile_targets': [
-          'default',
-        ],
-      },
-      'dawn-win-x86-intel-uhd630-rel': {
-        'os_type': 'win',
-        'mixins': [
-          'win10_intel_uhd_630_stable',
-        ],
-        'test_suites': {
-          'gtest_tests': 'real_hardware_win_gtests',
-        },
-      },
-      'dawn-win-x86-nvidia-gtx1660-rel': {
-        'os_type': 'win',
-        'mixins': [
-          'win10_nvidia_gtx_1660_stable',
-        ],
-        'test_suites': {
-          'gtest_tests': 'real_hardware_win_gtests',
-        },
-      },
       'dawn-win-x86-sws-dbg': {
         'os_type': 'win',
         'mixins': [
@@ -153,15 +130,6 @@
           'gtest_tests': 'win_software_renderer_gtests',
         },
       },
-      'dawn-win-x86-sws-rel': {
-        'os_type': 'win',
-        'mixins': [
-          'win10_gce_gpu_pool',
-        ],
-        'test_suites': {
-          'gtest_tests': 'win_software_renderer_gtests',
-        },
-      },
     },
   },
 ]