toolchain-utils: Add loading.desktop@@typical to nightly tests.
page_cycler_v2.typical_25 is deprecated (and flaky!). The
recommended replacement is loading.desktop@@typical. This CL updates
our nightly performance test infrastructure to handle
loading.desktop@@typical.
BUG=chromium:916340
TEST=Tested with nightly run on chrotomation2.
Change-Id: I6366b3a8e6a2926ad759a209cfded890e3109810
Reviewed-on: https://chromium-review.googlesource.com/1382826
Commit-Ready: Caroline Tice <cmtice@chromium.org>
Tested-by: Caroline Tice <cmtice@chromium.org>
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
diff --git a/buildbot_test_toolchains.py b/buildbot_test_toolchains.py
index bf3a8de..73decf2 100755
--- a/buildbot_test_toolchains.py
+++ b/buildbot_test_toolchains.py
@@ -92,7 +92,7 @@
Args:
trybot_image: artifact name such as
- 'daisy-release-tryjob/R40-6394.0.0-b1389'
+ 'daisy-release-tryjob/R40-6394.0.0-b1389'
Returns:
Latest official image name, e.g. 'daisy-release/R57-9089.0.0'.
@@ -117,7 +117,7 @@
Args:
trybot_image: artifact name such as
- 'daisy-release-tryjob/R40-6394.0.0-b1389'
+ 'daisy-release-tryjob/R40-6394.0.0-b1389'
Returns:
Corresponding chrome PFQ image name, e.g.
@@ -162,9 +162,10 @@
run_local: False
}
- benchmark: page_cycler_v2.typical_25 {
+ benchmark: loading.desktop {
suite: telemetry_Crosperf
- iterations: 0
+ test_args: --story-tag-filter=typical
+ iterations: 3
run_local: False
retries: 0
}
diff --git a/crosperf/benchmark.py b/crosperf/benchmark.py
index 967cfff..6869bac 100644
--- a/crosperf/benchmark.py
+++ b/crosperf/benchmark.py
@@ -17,6 +17,7 @@
'dromaeo.domcoremodify': 0.011,
'graphics_WebGLAquarium': 0.008,
'page_cycler_v2.typical_25': 0.021,
+ 'loading.desktop': 0.021, # Copied from page_cycler initially
}
diff --git a/crosperf/default-telemetry-results.json b/crosperf/default-telemetry-results.json
index 240664b..a25af7e 100644
--- a/crosperf/default-telemetry-results.json
+++ b/crosperf/default-telemetry-results.json
@@ -16,6 +16,10 @@
"percentage_smooth__percentage_smooth",
"percentage_smooth__summary"
],
+ "loading.desktop@@typical": [
+ "cold@@timeToFirstContentfulPaint_avg__summary",
+ "warm@@timeToFirstContentfulPaint_avg__summary"
+ ],
"page_cycler_v2.intl_es_fr_pt-BR": [
"cold_times__page_load_time",
"warm_times__page_load_time",
diff --git a/crosperf/results_organizer.py b/crosperf/results_organizer.py
index bda0cc1..c39119b 100644
--- a/crosperf/results_organizer.py
+++ b/crosperf/results_organizer.py
@@ -182,7 +182,7 @@
show_all_results = json_report or benchmark.show_all_results
if not show_all_results:
- summary_list = summary_file.get(benchmark.test_name)
+ summary_list = summary_file.get(benchmark.name)
if summary_list:
summary_list.append('retval')
else:
