Commit 96cfcfde authored by Ned Nguyen's avatar Ned Nguyen Committed by Commit Bot

Temporarily disable Telemetry perf test on Mac builders

NOTRY=true  # covered by PRESUBMIT tests

Bug: 868675
Cq-Include-Trybots: master.tryserver.chromium.perf:obbs_fyi
Change-Id: Ia5fb548ba314edda307b5b7d7d7d27ff9e24fb30
Reviewed-on: https://chromium-review.googlesource.com/1164565Reviewed-by: default avatarDavid Tu <dtu@chromium.org>
Commit-Queue: Ned Nguyen <nednguyen@google.com>
Cr-Commit-Position: refs/heads/master@{#581082}
parent 5a4f5742
...@@ -1447,50 +1447,6 @@ ...@@ -1447,50 +1447,6 @@
], ],
"script": "//testing/trigger_scripts/perf_device_trigger.py" "script": "//testing/trigger_scripts/perf_device_trigger.py"
} }
},
{
"args": [
"-v",
"--browser=release",
"--upload-results",
"--test-shard-map-filename=mac_1012_low_end_26_shard_map.json",
"--assert-gpu-compositing"
],
"isolate_name": "performance_test_suite",
"merge": {
"args": [
"--service-account-file",
"/creds/service_accounts/service-account-chromium-perf-histograms.json"
],
"script": "//tools/perf/process_perf_results.py"
},
"name": "performance_test_suite",
"override_compile_targets": [
"performance_test_suite"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:1626",
"os": "Mac-10.12",
"pool": "chrome.tests.perf"
}
],
"expiration": 21600,
"hard_timeout": 25200,
"ignore_task_failure": false,
"io_timeout": 1800,
"shards": 26,
"upload_test_results": true
},
"trigger_script": {
"args": [
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/perf_device_trigger.py"
}
} }
] ]
}, },
...@@ -1582,50 +1538,6 @@ ...@@ -1582,50 +1538,6 @@
"script": "//testing/trigger_scripts/perf_device_trigger.py" "script": "//testing/trigger_scripts/perf_device_trigger.py"
} }
}, },
{
"args": [
"-v",
"--browser=release",
"--upload-results",
"--test-shard-map-filename=mac_1013_high_end_26_shard_map.json",
"--assert-gpu-compositing"
],
"isolate_name": "performance_test_suite",
"merge": {
"args": [
"--service-account-file",
"/creds/service_accounts/service-account-chromium-perf-histograms.json"
],
"script": "//tools/perf/process_perf_results.py"
},
"name": "performance_test_suite",
"override_compile_targets": [
"performance_test_suite"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "1002:6821",
"os": "Mac-10.13",
"pool": "chrome.tests.perf"
}
],
"expiration": 21600,
"hard_timeout": 25200,
"ignore_task_failure": false,
"io_timeout": 1800,
"shards": 26,
"upload_test_results": true
},
"trigger_script": {
"args": [
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/perf_device_trigger.py"
}
},
{ {
"args": [ "args": [
"--gtest-benchmark-name", "--gtest-benchmark-name",
......
...@@ -450,15 +450,16 @@ NEW_PERF_RECIPE_MIGRATED_TESTERS = { ...@@ -450,15 +450,16 @@ NEW_PERF_RECIPE_MIGRATED_TESTERS = {
}, },
'mac-10_12_laptop_low_end-perf': { 'mac-10_12_laptop_low_end-perf': {
'tests': [ 'tests': [
{ # crbug.com/868675
'isolate': 'performance_test_suite', # {
'num_shards': 26, # 'isolate': 'performance_test_suite',
'extra_args': [ # 'num_shards': 26,
# '--run-ref-build', crbug.com/868675 # 'extra_args': [
'--test-shard-map-filename=mac_1012_low_end_26_shard_map.json', # '--run-ref-build',
'--assert-gpu-compositing', # '--test-shard-map-filename=mac_1012_low_end_26_shard_map.json',
], # '--assert-gpu-compositing',
}, # ],
# },
{ {
'isolate': 'load_library_perf_tests', 'isolate': 'load_library_perf_tests',
'num_shards': 1, 'num_shards': 1,
...@@ -519,15 +520,16 @@ NEW_PERF_RECIPE_MIGRATED_TESTERS = { ...@@ -519,15 +520,16 @@ NEW_PERF_RECIPE_MIGRATED_TESTERS = {
}, },
'mac-10_13_laptop_high_end-perf': { 'mac-10_13_laptop_high_end-perf': {
'tests': [ 'tests': [
{ # crbug.com/868675
'isolate': 'performance_test_suite', # {
'extra_args': [ # 'isolate': 'performance_test_suite',
# '--run-ref-build', crbug.com/868675 # 'extra_args': [
'--test-shard-map-filename=mac_1013_high_end_26_shard_map.json', # '--run-ref-build',
'--assert-gpu-compositing', # '--test-shard-map-filename=mac_1013_high_end_26_shard_map.json',
], # '--assert-gpu-compositing',
'num_shards': 26 # ],
}, # 'num_shards': 26
# },
{ {
'isolate': 'net_perftests', 'isolate': 'net_perftests',
'num_shards': 1, 'num_shards': 1,
......
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