Skip to content

A
angle
Commit 167a4b6d by Jamie Madill Committed by Commit Bot
Options

infra: Add Linux isolated scripts to specs.

We were missing the perftests and Gold tests from Linux Intel/NV. Bug: angleproject:5114 Change-Id: I1cfc0963b3890c621f0646bb5879e47ea6d336a4 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2873457Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent e2c87b4f
Showing with 140 additions and 0 deletions
infra/specs/angle.json
...@@ -111,6 +111,75 @@ ...@@ -111,6 +111,75 @@
"test_id_prefix": "ninja://src/tests:angle_white_box_tests/", "test_id_prefix": "ninja://src/tests:angle_white_box_tests/",
"use_isolated_scripts_api": true "use_isolated_scripts_api": true
} }
],
"isolated_scripts": [
{
"args": [
"angle_perftests",
"--non-telemetry=true",
"--gtest-benchmark-name=angle_perftests",
"-v",
"--one-frame-only",
"--test-timeout=100",
"--batch-size=1",
"--bot-mode",
"--max-processes=1",
"--print-test-stdout"
],
"isolate_name": "angle_perftests",
"merge": {
"args": [
"--smoke-test-mode"
],
"script": "//tools/perf/process_perf_results.py"
},
"name": "angle_perftests",
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "8086:5912-19.0.2",
"os": "Ubuntu-19.04",
"pool": "chromium.tests.gpu"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 2
},
"test_id_prefix": "ninja://src/tests:angle_perftests/"
},
{
"args": [
"--test-machine-name",
"${buildername}",
"--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,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "8086:5912-19.0.2",
"os": "Ubuntu-19.04",
"pool": "chromium.tests.gpu"
}
],
"service_account": "chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://src/tests/restricted_traces:angle_restricted_trace_gold_tests/"
}
] ]
}, },
"linux-nvidia": { "linux-nvidia": {
...@@ -669,6 +738,75 @@ ...@@ -669,6 +738,75 @@
"test_id_prefix": "ninja://src/tests:angle_white_box_tests/", "test_id_prefix": "ninja://src/tests:angle_white_box_tests/",
"use_isolated_scripts_api": true "use_isolated_scripts_api": true
} }
],
"isolated_scripts": [
{
"args": [
"angle_perftests",
"--non-telemetry=true",
"--gtest-benchmark-name=angle_perftests",
"-v",
"--one-frame-only",
"--test-timeout=100",
"--batch-size=1",
"--bot-mode",
"--max-processes=1",
"--print-test-stdout"
],
"isolate_name": "angle_perftests",
"merge": {
"args": [
"--smoke-test-mode"
],
"script": "//tools/perf/process_perf_results.py"
},
"name": "angle_perftests",
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-418.56",
"os": "Ubuntu-19.04",
"pool": "chromium.tests.gpu"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 2
},
"test_id_prefix": "ninja://src/tests:angle_perftests/"
},
{
"args": [
"--test-machine-name",
"${buildername}",
"--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,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-418.56",
"os": "Ubuntu-19.04",
"pool": "chromium.tests.gpu"
}
],
"service_account": "chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://src/tests/restricted_traces:angle_restricted_trace_gold_tests/"
}
] ]
}, },
"mac-amd": { "mac-amd": {
......
infra/specs/waterfalls.pyl
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'linux_intel_gtests', 'gtest_tests': 'linux_intel_gtests',
'isolated_scripts': 'common_isolated_scripts',
}, },
}, },
'linux-nvidia': { 'linux-nvidia': {
...@@ -38,6 +39,7 @@ ...@@ -38,6 +39,7 @@
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'linux_nvidia_gtests', 'gtest_tests': 'linux_nvidia_gtests',
'isolated_scripts': 'common_isolated_scripts',
}, },
}, },
'mac-amd': { 'mac-amd': {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment