aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--infra/specs/angle.json45
-rw-r--r--infra/specs/waterfalls.pyl1
-rw-r--r--scripts/code_generation_hashes/Test_spec_JSON.json4
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":