Commit 5067b69c authored by Caleb Rouleau's avatar Caleb Rouleau

[Telemetry][CI] Replace --smoke-test-mode with --pageset-repeat=1

--smoke-test-mode's only effect is to set pageset-repeat to 1.
This is only true for benchmark runs. For merge scripts,
that flag has different meaning and does not need to be removed.

Note that Note that we currently support duplicate conflicting flags:
for example
‘run_benchmark ... --pageset-repeat=2 --pageset-repeat=3’
We use the last flag, 3 in the example.

--smoke-test-mode is getting deprecated in
https://chromium-review.googlesource.com/c/catapult/+/1356903


Bug: 894254
Change-Id: I1b0e423167018f6010f66255838ad8a33d6acd76
Reviewed-on: https://chromium-review.googlesource.com/c/1357722Reviewed-by: default avatarNed Nguyen <nednguyen@google.com>
Reviewed-by: default avatarEmily Hanley <eyaich@chromium.org>
Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Commit-Queue: Caleb Rouleau <crouleau@chromium.org>
Cr-Commit-Position: refs/heads/master@{#613342}
parent 49c3b5dd
......@@ -709,7 +709,7 @@
"isolated_scripts": [
{
"args": [
"--smoke-test-mode",
"--pageset-repeat=1",
"--benchmarks=heap_profiling.mobile.disabled,heap_profiling.mobile.native,heap_profiling.mobile.pseudo",
"-v",
"--output-format=chartjson",
......
......@@ -848,7 +848,7 @@
"isolated_scripts": [
{
"args": [
"--smoke-test-mode",
"--pageset-repeat=1",
"--test-shard-map-filename=linux_leak_detection_shard_map.json",
"--upload-results",
"--output-format=histograms",
......
......@@ -5524,7 +5524,7 @@
},
{
"args": [
"--smoke-test-mode",
"--pageset-repeat=1",
"--test-shard-map-filename=smoke_test_benchmark_shard_map.json",
"--browser=debug"
],
......
......@@ -3299,7 +3299,7 @@
},
{
"args": [
"--smoke-test-mode",
"--pageset-repeat=1",
"--test-shard-map-filename=smoke_test_benchmark_shard_map.json",
"--browser=debug_x64"
],
......@@ -4866,7 +4866,7 @@
},
{
"args": [
"--smoke-test-mode",
"--pageset-repeat=1",
"--test-shard-map-filename=smoke_test_benchmark_shard_map.json",
"--browser=debug"
],
......
......@@ -1714,7 +1714,7 @@
'leak_detection_isolated_scripts': {
'memory.leak_detection': {
'args': [
'--smoke-test-mode',
'--pageset-repeat=1',
'--test-shard-map-filename=linux_leak_detection_shard_map.json',
'--upload-results',
'--output-format=histograms',
......@@ -1921,7 +1921,7 @@
'memory_infra_isolated_scripts': {
'heap_profiling.mobile': {
'args': [
'--smoke-test-mode',
'--pageset-repeat=1',
'--benchmarks=heap_profiling.mobile.disabled,heap_profiling.mobile.native,heap_profiling.mobile.pseudo',
'-v',
'--output-format=chartjson',
......@@ -2212,7 +2212,7 @@
'performance_smoke_test_isolated_scripts': {
'performance_test_suite': {
'args': [
'--smoke-test-mode',
'--pageset-repeat=1',
'--test-shard-map-filename=smoke_test_benchmark_shard_map.json',
],
'swarming': {
......
......@@ -44,13 +44,13 @@ def SmokeTestGenerator(benchmark, num_pages=1):
#
# This smoke test dynamically tests all benchmarks. So disabling it for one
# failing or flaky benchmark would disable a much wider swath of coverage
# than is usally intended. Instead, if a particular benchmark is failing,
# than is usually intended. Instead, if a particular benchmark is failing,
# disable it in tools/perf/benchmarks/*.
@decorators.Disabled('chromeos') # crbug.com/351114
@decorators.Disabled('android') # crbug.com/641934
def BenchmarkSmokeTest(self):
# Only measure a single page so that this test cycles reasonably quickly.
benchmark.options['smoke_test_mode'] = True
benchmark.options['pageset_repeat'] = 1
# Some benchmarks are running multiple iterations
# which is not needed for a smoke test
......
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