From 242f0d81f132df9b5d172e6471d9eca3dcf5a467 Mon Sep 17 00:00:00 2001
From: Cody Northrop <cnorthrop@google.com>
Date: Tue, 19 Apr 2022 10:40:50 -0600
Subject: Revert "Infra: Enable Skia Gold tests on Pixel 6"

This reverts commit 3636d129ee9c6c970e9b31883fcc88c539382434.

Reason for revert: Causing test timeouts on Pixel 6:
https://bugs.chromium.org/p/angleproject/issues/detail?id=7216

Original change's description:
> Infra: Enable Skia Gold tests on Pixel 6
>
> We have our first trace that can't run on any existing
> bots, so we need to expand to Pixel 6.
>
> Test: TracePerfTest.Run/vulkan_car_chase
> Bug: angleproject:7125
> Bug: chromium:1280418
> Change-Id: I7a81d42bc336c7df398b1d1712cf25c0eb9d72d3
> Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3561490
> Auto-Submit: Cody Northrop <cnorthrop@google.com>
> Reviewed-by: Jamie Madill <jmadill@chromium.org>
> Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
> Commit-Queue: Cody Northrop <cnorthrop@google.com>

Bug: angleproject:7216
Bug: angleproject:7125
Bug: chromium:1280418
Change-Id: Ieca910fa11f81a3f526e9ccff49fa636fd3b7d13
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3594112
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Cody Northrop <cnorthrop@google.com>
Auto-Submit: Cody Northrop <cnorthrop@google.com>
---
 infra/specs/angle.json                             | 45 ----------------------
 infra/specs/waterfalls.pyl                         |  1 -
 scripts/code_generation_hashes/Test_spec_JSON.json |  4 +-
 3 files changed, 2 insertions(+), 48 deletions(-)

diff --git a/infra/specs/angle.json b/infra/specs/angle.json
index 174e2a1d10..2e35e5211e 100644
--- a/infra/specs/angle.json
+++ b/infra/specs/angle.json
@@ -980,51 +980,6 @@
         "test_id_prefix": "ninja://src/tests:angle_unittests/",
         "use_isolated_scripts_api": true
       }
-    ],
-    "isolated_scripts": [
-      {
-        "args": [
-          "--test-machine-name",
-          "${buildername}",
-          "-v",
-          "--git-revision=${got_angle_revision}"
-        ],
-        "isolate_name": "angle_restricted_trace_gold_tests",
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "angle_restricted_trace_gold_tests",
-        "precommit_args": [
-          "--gerrit-issue=${patch_issue}",
-          "--gerrit-patchset=${patch_set}",
-          "--buildbucket-id=${buildbucket_build_id}"
-        ],
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "cipd_packages": [
-            {
-              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
-              "location": "bin",
-              "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
-            }
-          ],
-          "containment_type": "AUTO",
-          "dimension_sets": [
-            {
-              "device_os": "T",
-              "device_os_type": "userdebug",
-              "device_type": "oriole",
-              "os": "Android",
-              "pool": "chromium.tests.gpu"
-            }
-          ],
-          "expiration": 21600,
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 6
-        },
-        "test_id_prefix": "ninja://src/tests/restricted_traces:angle_restricted_trace_gold_tests/"
-      }
     ]
   },
   "linux-intel": {
diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl
index 65276de050..ea2c9583ab 100644
--- a/infra/specs/waterfalls.pyl
+++ b/infra/specs/waterfalls.pyl
@@ -52,7 +52,6 @@
         ],
         'test_suites': {
           'gtest_tests': 'android_vulkan_gtests',
-          'isolated_scripts': 'angle_restricted_trace_gold_isolated_scripts',
         },
       },
       'linux-intel': {
diff --git a/scripts/code_generation_hashes/Test_spec_JSON.json b/scripts/code_generation_hashes/Test_spec_JSON.json
index 3d2a1ee5f1..50d529f65b 100644
--- a/scripts/code_generation_hashes/Test_spec_JSON.json
+++ b/scripts/code_generation_hashes/Test_spec_JSON.json
@@ -1,6 +1,6 @@
 {
   "infra/specs/angle.json":
-    "1582950d69c4808629756cb999ec97fb",
+    "a0c670a8a4333030406d3774a2f932ca",
   "infra/specs/generate_test_spec_json.py":
     "be4569626aa91f8872664e2d9cef4ac2",
   "infra/specs/mixins.pyl":
@@ -12,7 +12,7 @@
   "infra/specs/variants.pyl":
     "8cfcaa99fa07ad2a2d5d14f220fd5037",
   "infra/specs/waterfalls.pyl":
-    "b8ca70302e1608e845f253919bff97e6",
+    "db329524ea9686da7b32544a26b13203",
   "testing/buildbot/generate_buildbot_json.py":
     "dedd849a6d73b647daaeef0e7ab837a5",
   "testing/buildbot/mixins.pyl":
-- 
cgit v1.2.3