Move Cros and telemetry perf tests to the new performance suite
BUG=chromium:445206
TEST=None
Change-Id: If5cbd08f3c28e38e023800234b66b48677b6bef3
Reviewed-on: https://chromium-review.googlesource.com/240178
Reviewed-by: Dan Shi <dshi@chromium.org>
Commit-Queue: Rohit Makasana <rohitbm@chromium.org>
Tested-by: Rohit Makasana <rohitbm@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/240393
Reviewed-by: Rohit Makasana <rohitbm@chromium.org>
diff --git a/client/site_tests/graphics_WebGLAquarium/control b/client/site_tests/graphics_WebGLAquarium/control
index f2bfeb0..4e8b391 100644
--- a/client/site_tests/graphics_WebGLAquarium/control
+++ b/client/site_tests/graphics_WebGLAquarium/control
@@ -6,7 +6,7 @@
NAME = "graphics_WebGLAquarium"
PURPOSE = "Execute the WebGL aquarium test suite."
CRITERIA = "All suite tests must not crash/hang."
-SUITE = 'bvt-perbuild, graphics, graphics_browser'
+SUITE = 'performance, graphics, graphics_browser'
TIME = "medium"
TEST_CATEGORY = "Performance"
TEST_CLASS = "graphics"
diff --git a/client/site_tests/graphics_WebGLManyPlanetsDeep/control b/client/site_tests/graphics_WebGLManyPlanetsDeep/control
index 0edaa5d..7e175cd 100644
--- a/client/site_tests/graphics_WebGLManyPlanetsDeep/control
+++ b/client/site_tests/graphics_WebGLManyPlanetsDeep/control
@@ -6,7 +6,7 @@
NAME = "graphics_WebGLManyPlanetsDeep"
PURPOSE = "Execute the WebGL many planets deep test suite."
CRITERIA = "All suite tests must not crash/hang."
-SUITE = 'graphics_per-day, graphics, graphics_browser'
+SUITE = 'performance, graphics_per-day, graphics, graphics_browser'
TIME = "medium"
TEST_CATEGORY = "Performance"
TEST_CLASS = "graphics"
diff --git a/client/site_tests/graphics_WebGLPerformance/control b/client/site_tests/graphics_WebGLPerformance/control
index 53d4bdb..3e853bc 100644
--- a/client/site_tests/graphics_WebGLPerformance/control
+++ b/client/site_tests/graphics_WebGLPerformance/control
@@ -6,7 +6,7 @@
NAME = "graphics_WebGLPerformance"
PURPOSE = "Execute the WebGL performance test suite."
CRITERIA = "All suite tests must not crash/hang."
-SUITE = "bvt-perbuild, graphics, graphics_browser"
+SUITE = "performance, graphics, graphics_browser"
TIME = "medium"
TEST_CATEGORY = "Performance"
TEST_CLASS = "graphics"
diff --git a/client/site_tests/platform_BootPerf/control b/client/site_tests/platform_BootPerf/control
index 8a50ab4..c035078 100644
--- a/client/site_tests/platform_BootPerf/control
+++ b/client/site_tests/platform_BootPerf/control
@@ -9,7 +9,7 @@
The test will fail if startup times or shut down times are exceeded. These
values are set in the suite control file.
"""
-SUITE = "bvt-perbuild"
+SUITE = "performance"
TIME = "SHORT"
TEST_CATEGORY = "Benchmark"
TEST_CLASS = "platform"
diff --git a/client/site_tests/platform_Pkcs11LoadPerf/control b/client/site_tests/platform_Pkcs11LoadPerf/control
index 6c1c60b..4fcdcba 100644
--- a/client/site_tests/platform_Pkcs11LoadPerf/control
+++ b/client/site_tests/platform_Pkcs11LoadPerf/control
@@ -4,7 +4,7 @@
AUTHOR = "dkrahn"
NAME = "platform_Pkcs11LoadPerf"
-SUITE = "bvt-perbuild"
+SUITE = "performance"
TIME = "SHORT"
TEST_CATEGORY = "Performance"
TEST_CLASS = "platform"
diff --git a/client/site_tests/power_Resume/control b/client/site_tests/power_Resume/control
index 6e625b1..0b80b16 100644
--- a/client/site_tests/power_Resume/control
+++ b/client/site_tests/power_Resume/control
@@ -6,7 +6,7 @@
NAME = "power_Resume"
PURPOSE = "Measure the amount of time it takes to resume from suspend."
CRITERIA = "This test is a benchmark."
-SUITE = "bvt-perbuild"
+SUITE = "performance"
TIME = "SHORT"
TEST_CATEGORY = "Logging"
TEST_CLASS = "power"
diff --git a/client/site_tests/video_VDAPerf/control.h264 b/client/site_tests/video_VDAPerf/control.h264
index 6642f82..20e749c 100644
--- a/client/site_tests/video_VDAPerf/control.h264
+++ b/client/site_tests/video_VDAPerf/control.h264
@@ -8,7 +8,7 @@
CRITERIA = """
The test fails if the video_decode_accelerator_unittest fails or crashes.
"""
-SUITE = "bvt-perbuild"
+SUITE = "performance"
TIME = "SHORT"
TEST_CATEGORY = "Performance"
TEST_CLASS = "video"
diff --git a/client/site_tests/video_VDAPerf/control.vp8 b/client/site_tests/video_VDAPerf/control.vp8
index 784f63f..ef2c9ae 100644
--- a/client/site_tests/video_VDAPerf/control.vp8
+++ b/client/site_tests/video_VDAPerf/control.vp8
@@ -8,7 +8,7 @@
CRITERIA = """
The test fails if the video_decode_accelerator_unittest fails or crashes.
"""
-SUITE = "bvt-perbuild"
+SUITE = "performance"
TIME = "SHORT"
TEST_CATEGORY = "Performance"
TEST_CLASS = "video"
diff --git a/client/site_tests/video_WebRtcPerf/control b/client/site_tests/video_WebRtcPerf/control
index a585072..06662dc 100644
--- a/client/site_tests/video_WebRtcPerf/control
+++ b/client/site_tests/video_WebRtcPerf/control
@@ -6,7 +6,7 @@
NAME = "video_WebRtcPerf"
PURPOSE = "Make sure WebRTC is hardware decode accelerated."
CRITERIA = "Fails if hardware decode acceleration is not used."
-SUITE = "bvt-perbuild"
+SUITE = "performance"
TIME = "SHORT"
TEST_CATEGORY = "Performance"
TEST_CLASS = "video"
diff --git a/server/site_tests/platform_BootPerfServer/control b/server/site_tests/platform_BootPerfServer/control
index 28c1ae6..0d14e30 100644
--- a/server/site_tests/platform_BootPerfServer/control
+++ b/server/site_tests/platform_BootPerfServer/control
@@ -4,7 +4,7 @@
NAME = "BootPerfServer"
AUTHOR = "Chrome OS Team"
-SUITE = "kernel_per-build_benchmarks"
+SUITE = "performance, kernel_per-build_benchmarks"
TIME = "SHORT"
TEST_CATEGORY = "Benchmark"
TEST_CLASS = "platform"
diff --git a/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoreattr b/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoreattr
index 440ee41..d2b6311 100644
--- a/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoreattr
+++ b/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoreattr
@@ -4,13 +4,13 @@
from autotest_lib.client.common_lib import utils
-AUTHOR = "sbasi, achuith, rohitbm"
-NAME = "telemetry_Benchmarks.dromaeo.domcoreattr"
-SUITE = "bvt-perbuild"
-TIME = "LONG"
-TEST_CATEGORY = "Benchmark"
-TEST_CLASS = "performance"
-TEST_TYPE = "server"
+AUTHOR = 'sbasi, achuith, rohitbm'
+NAME = 'telemetry_Benchmarks.dromaeo.domcoreattr'
+SUITE = 'performance'
+TIME = 'LONG'
+TEST_CATEGORY = 'Benchmark'
+TEST_CLASS = 'performance'
+TEST_TYPE = 'server'
DOC = """
This server side test suite executes the Telemetry Dromaeo Dom Core Attr
diff --git a/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoremodify b/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoremodify
index 75203cb..ceab875 100644
--- a/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoremodify
+++ b/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoremodify
@@ -4,13 +4,13 @@
from autotest_lib.client.common_lib import utils
-AUTHOR = "sbasi, achuith, rohitbm"
-NAME = "telemetry_Benchmarks.dromaeo.domcoremodify"
-SUITE = "bvt-perbuild"
-TIME = "LONG"
-TEST_CATEGORY = "Benchmark"
-TEST_CLASS = "performance"
-TEST_TYPE = "server"
+UTHOR = 'sbasi, achuith, rohitbm'
+NAME = 'telemetry_Benchmarks.dromaeo.domcoremodify'
+SUITE = 'performance'
+TIME = 'LONG'
+TEST_CATEGORY = 'Benchmark'
+TEST_CLASS = 'performance'
+TEST_TYPE = 'server'
DOC = """
This server side test suite executes the Telemetry Dromaeo Dom Core Modify
diff --git a/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcorequery b/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcorequery
index 403a0d5..a69cb82 100644
--- a/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcorequery
+++ b/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcorequery
@@ -4,13 +4,13 @@
from autotest_lib.client.common_lib import utils
-AUTHOR = "sbasi, achuith, rohitbm"
-NAME = "telemetry_Benchmarks.dromaeo.domcorequery"
-SUITE = "bvt-perbuild"
-TIME = "LONG"
-TEST_CATEGORY = "Benchmark"
-TEST_CLASS = "performance"
-TEST_TYPE = "server"
+UTHOR = 'sbasi, achuith, rohitbm'
+NAME = 'telemetry_Benchmarks.dromaeo.domcorequery'
+SUITE = 'performance'
+TIME = 'LONG'
+TEST_CATEGORY = 'Benchmark'
+TEST_CLASS = 'performance'
+TEST_TYPE = 'server'
DOC = """
This server side test suite executes the Telemetry Dromaeo Dom Core Query
diff --git a/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoretraverse b/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoretraverse
index 1b881fe..cae782e 100644
--- a/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoretraverse
+++ b/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoretraverse
@@ -4,13 +4,13 @@
from autotest_lib.client.common_lib import utils
-AUTHOR = "sbasi, achuith, rohitbm"
-NAME = "telemetry_Benchmarks.dromaeo.domcoretraverse"
-SUITE = "bvt-perbuild"
-TIME = "LONG"
-TEST_CATEGORY = "Benchmark"
-TEST_CLASS = "performance"
-TEST_TYPE = "server"
+AUTHOR = 'sbasi, achuith, rohitbm'
+NAME = 'telemetry_Benchmarks.dromaeo.domcoretraverse'
+SUITE = 'performance'
+TIME = 'LONG'
+TEST_CATEGORY = 'Benchmark'
+TEST_CLASS = 'performance'
+TEST_TYPE = 'server'
DOC = """
This server side test suite executes the Telemetry Dromaeo Dom Core Traverse
diff --git a/server/site_tests/telemetry_Benchmarks/control.jetstream b/server/site_tests/telemetry_Benchmarks/control.jetstream
new file mode 100644
index 0000000..4ac91a9
--- /dev/null
+++ b/server/site_tests/telemetry_Benchmarks/control.jetstream
@@ -0,0 +1,32 @@
+# Copyright 2014 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Do not edit this file! It was created by generate_controlfiles.py.
+
+from autotest_lib.client.common_lib import utils
+
+AUTHOR = 'sbasi, achuith, rohitbm'
+NAME = 'telemetry_Benchmarks.jetstream'
+SUITE = 'performance'
+TIME = 'LONG'
+TEST_CATEGORY = 'Benchmark'
+TEST_CLASS = 'performance'
+TEST_TYPE = 'server'
+
+DOC = '''
+This server side test suite executes the Telemetry Benchmark:
+jetstream
+This is part of Chrome for Chrome OS performance testing.
+
+Pass local=True to run with local telemetry and no AFE server.
+'''
+
+def run_benchmark(machine):
+ host = hosts.create_host(machine)
+ job.run_test('telemetry_Benchmarks', host=host,
+ benchmark='jetstream',
+ tag='jetstream',
+ args=utils.args_to_dict(args))
+
+parallel_simple(run_benchmark, machines)
\ No newline at end of file
diff --git a/server/site_tests/telemetry_Benchmarks/control.kraken b/server/site_tests/telemetry_Benchmarks/control.kraken
index a6c55fe..5d6ed52 100644
--- a/server/site_tests/telemetry_Benchmarks/control.kraken
+++ b/server/site_tests/telemetry_Benchmarks/control.kraken
@@ -4,13 +4,13 @@
from autotest_lib.client.common_lib import utils
-AUTHOR = "sbasi, achuith, rohitbm"
-NAME = "telemetry_Benchmarks.kraken"
-SUITE = "bvt-perbuild"
-TIME = "LONG"
-TEST_CATEGORY = "Benchmark"
-TEST_CLASS = "performance"
-TEST_TYPE = "server"
+AUTHOR = 'sbasi, achuith, rohitbm'
+NAME = 'telemetry_Benchmarks.kraken'
+SUITE = 'performance'
+TIME = 'LONG'
+TEST_CATEGORY = 'Benchmark'
+TEST_CLASS = 'performance'
+TEST_TYPE = 'server'
DOC = """
This server side test suite executes the Telemetry Kraken Benchmark.
diff --git a/server/site_tests/telemetry_Benchmarks/control.media.chromeOS.tough_video_cases b/server/site_tests/telemetry_Benchmarks/control.media.chromeOS.tough_video_cases
index 015cfab..99a85f0 100644
--- a/server/site_tests/telemetry_Benchmarks/control.media.chromeOS.tough_video_cases
+++ b/server/site_tests/telemetry_Benchmarks/control.media.chromeOS.tough_video_cases
@@ -4,13 +4,13 @@
from autotest_lib.client.common_lib import utils
-AUTHOR = "sbasi, achuith, rohitbm"
-NAME = "telemetry_Benchmarks.media.chromeOS.tough_video_cases"
-SUITE = "bvt-perbuild"
-TIME = "LONG"
-TEST_CATEGORY = "Benchmark"
-TEST_CLASS = "performance"
-TEST_TYPE = "server"
+AUTHOR = 'sbasi, achuith, rohitbm'
+NAME = 'telemetry_Benchmarks.media.chromeOS.tough_video_cases'
+SUITE = 'performance'
+TIME = 'LONG'
+TEST_CATEGORY = 'Benchmark'
+TEST_CLASS = 'performance'
+TEST_TYPE = 'server'
DOC = """
This server side test suite executes the Telemetry Media Benchmark for ChromeOS.
diff --git a/server/site_tests/telemetry_Benchmarks/control.media.chromeOS4kOnly.tough_video_cases b/server/site_tests/telemetry_Benchmarks/control.media.chromeOS4kOnly.tough_video_cases
index 94849bb..7176c97 100644
--- a/server/site_tests/telemetry_Benchmarks/control.media.chromeOS4kOnly.tough_video_cases
+++ b/server/site_tests/telemetry_Benchmarks/control.media.chromeOS4kOnly.tough_video_cases
@@ -4,13 +4,13 @@
from autotest_lib.client.common_lib import utils
-AUTHOR = "sbasi, achuith, rohitbm"
-NAME = "telemetry_Benchmarks.media.chromeOS4kOnly.tough_video_cases"
-SUITE = "bvt-perbuild"
-TIME = "LONG"
-TEST_CATEGORY = "Benchmark"
-TEST_CLASS = "performance"
-TEST_TYPE = "server"
+AUTHOR = 'sbasi, achuith, rohitbm'
+NAME = 'telemetry_Benchmarks.media.chromeOS4kOnly.tough_video_cases'
+SUITE = 'performance'
+TIME = 'LONG'
+TEST_CATEGORY = 'Benchmark'
+TEST_CLASS = 'performance'
+TEST_TYPE = 'server'
DEPENDENCIES = "4k_video"
DOC = """
diff --git a/server/site_tests/telemetry_Benchmarks/control.memory.top_7_stress b/server/site_tests/telemetry_Benchmarks/control.memory.top_7_stress
index 56c258a..c41a2c2 100644
--- a/server/site_tests/telemetry_Benchmarks/control.memory.top_7_stress
+++ b/server/site_tests/telemetry_Benchmarks/control.memory.top_7_stress
@@ -8,7 +8,7 @@
AUTHOR = 'sbasi, achuith, rohitbm'
NAME = 'telemetry_Benchmarks.memory.top_7_stress'
-SUITE = 'bvt-perbuild'
+SUITE = 'performance'
TIME = 'LONG'
TEST_CATEGORY = 'Benchmark'
TEST_CLASS = 'performance'
diff --git a/server/site_tests/telemetry_Benchmarks/control.octane b/server/site_tests/telemetry_Benchmarks/control.octane
index 63b3889..c34cde3 100644
--- a/server/site_tests/telemetry_Benchmarks/control.octane
+++ b/server/site_tests/telemetry_Benchmarks/control.octane
@@ -4,13 +4,13 @@
from autotest_lib.client.common_lib import utils
-AUTHOR = "sbasi, achuith, rohitbm"
-NAME = "telemetry_Benchmarks.octane"
-SUITE = "bvt-perbuild"
-TIME = "LONG"
-TEST_CATEGORY = "Benchmark"
-TEST_CLASS = "performance"
-TEST_TYPE = "server"
+AUTHOR = 'sbasi, achuith, rohitbm'
+NAME = 'telemetry_Benchmarks.octane'
+SUITE = 'performance'
+TIME = 'LONG'
+TEST_CATEGORY = 'Benchmark'
+TEST_CLASS = 'performance'
+TEST_TYPE = 'server'
DOC = """
This server side test suite executes the Telemetry Octane Benchmark.
diff --git a/server/site_tests/telemetry_Benchmarks/control.page_cycler.typical_25 b/server/site_tests/telemetry_Benchmarks/control.page_cycler.typical_25
index 290474a..a4704c2 100644
--- a/server/site_tests/telemetry_Benchmarks/control.page_cycler.typical_25
+++ b/server/site_tests/telemetry_Benchmarks/control.page_cycler.typical_25
@@ -4,13 +4,13 @@
from autotest_lib.client.common_lib import utils
-AUTHOR = "sbasi, achuith, rohitbm"
-NAME = "telemetry_Benchmarks.page_cycler.typical_25"
-SUITE = "bvt-perbuild"
-TIME = "LONG"
-TEST_CATEGORY = "Benchmark"
-TEST_CLASS = "performance"
-TEST_TYPE = "server"
+AUTHOR = 'sbasi, achuith, rohitbm'
+NAME = 'telemetry_Benchmarks.page_cycler.typical_25'
+SUITE = 'performance'
+TIME = 'LONG'
+TEST_CATEGORY = 'Benchmark'
+TEST_CLASS = 'performance'
+TEST_TYPE = 'server'
DOC = """
This server side test suite executes the Telemetry Page Loading
diff --git a/server/site_tests/telemetry_Benchmarks/control.robohornet_pro b/server/site_tests/telemetry_Benchmarks/control.robohornet_pro
index 58d33fb..e3c3f9e 100644
--- a/server/site_tests/telemetry_Benchmarks/control.robohornet_pro
+++ b/server/site_tests/telemetry_Benchmarks/control.robohornet_pro
@@ -4,13 +4,13 @@
from autotest_lib.client.common_lib import utils
-AUTHOR = "sbasi, achuith, rohitbm"
-NAME = "telemetry_Benchmarks.robohornet_pro"
-SUITE = "bvt-perbuild"
-TIME = "LONG"
-TEST_CATEGORY = "Benchmark"
-TEST_CLASS = "performance"
-TEST_TYPE = "server"
+AUTHOR = 'sbasi, achuith, rohitbm'
+NAME = 'telemetry_Benchmarks.robohornet_pro'
+SUITE = 'performance'
+TIME = 'LONG'
+TEST_CATEGORY = 'Benchmark'
+TEST_CLASS = 'performance'
+TEST_TYPE = 'server'
DOC = """
This server side test suite executes the Telemetry RoboHornet Pro Benchmark.
diff --git a/server/site_tests/telemetry_Benchmarks/control.session_restore.cold.typical_25 b/server/site_tests/telemetry_Benchmarks/control.session_restore.cold.typical_25
index 97c13b9..46c5eee 100644
--- a/server/site_tests/telemetry_Benchmarks/control.session_restore.cold.typical_25
+++ b/server/site_tests/telemetry_Benchmarks/control.session_restore.cold.typical_25
@@ -4,13 +4,13 @@
from autotest_lib.client.common_lib import utils
-AUTHOR = "sbasi, achuith, rohitbm"
-NAME = "telemetry_Benchmarks.session_restore.cold.typical_25"
-SUITE = "bvt-perbuild"
-TIME = "LONG"
-TEST_CATEGORY = "Benchmark"
-TEST_CLASS = "performance"
-TEST_TYPE = "server"
+AUTHOR = 'sbasi, achuith, rohitbm'
+NAME = 'telemetry_Benchmarks.session_restore.cold.typical_25'
+SUITE = 'performance'
+TIME = 'LONG'
+TEST_CATEGORY = 'Benchmark'
+TEST_CLASS = 'performance'
+TEST_TYPE = 'server'
DOC = """
This server side test suite executes the Telemetry session restore performance
diff --git a/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_animation_cases b/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_animation_cases
index 1b53c44..4be4b33 100644
--- a/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_animation_cases
+++ b/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_animation_cases
@@ -4,13 +4,13 @@
from autotest_lib.client.common_lib import utils
-AUTHOR = "sbasi, achuith, rohitbm"
-NAME = "telemetry_Benchmarks.smoothness.tough_animation_cases"
-SUITE = "bvt-perbuild"
-TIME = "LONG"
-TEST_CATEGORY = "Benchmark"
-TEST_CLASS = "performance"
-TEST_TYPE = "server"
+AUTHOR = 'sbasi, achuith, rohitbm'
+NAME = 'telemetry_Benchmarks.smoothness.tough_animation_cases'
+SUITE = 'performance'
+TIME = 'LONG'
+TEST_CATEGORY = 'Benchmark'
+TEST_CLASS = 'performance'
+TEST_TYPE = 'server'
DOC = """
This server side test suite executes the Telemetry smoothness measurement test
diff --git a/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_canvas_cases b/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_canvas_cases
index aaa90dd..bac9921 100644
--- a/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_canvas_cases
+++ b/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_canvas_cases
@@ -4,13 +4,13 @@
from autotest_lib.client.common_lib import utils
-AUTHOR = "sbasi, achuith, rohitbm"
-NAME = "telemetry_Benchmarks.smoothness.tough_canvas_cases"
-SUITE = "bvt-perbuild"
-TIME = "LONG"
-TEST_CATEGORY = "Benchmark"
-TEST_CLASS = "performance"
-TEST_TYPE = "server"
+AUTHOR = 'sbasi, achuith, rohitbm'
+NAME = 'telemetry_Benchmarks.smoothness.tough_canvas_cases'
+SUITE = 'performance'
+TIME = 'LONG'
+TEST_CATEGORY = 'Benchmark'
+TEST_CLASS = 'performance'
+TEST_TYPE = 'server'
DOC = """
This server side test suite executes the Telemetry smoothness measurement test.
diff --git a/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_filters_cases b/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_filters_cases
index 265220a..27caa99 100644
--- a/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_filters_cases
+++ b/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_filters_cases
@@ -4,13 +4,13 @@
from autotest_lib.client.common_lib import utils
-AUTHOR = "sbasi, achuith, rohitbm"
-NAME = "telemetry_Benchmarks.smoothness.tough_filters_cases"
-SUITE = "bvt-perbuild"
-TIME = "LONG"
-TEST_CATEGORY = "Benchmark"
-TEST_CLASS = "performance"
-TEST_TYPE = "server"
+AUTHOR = 'sbasi, achuith, rohitbm'
+NAME = 'telemetry_Benchmarks.smoothness.tough_filters_cases'
+SUITE = 'performance'
+TIME = 'LONG'
+TEST_CATEGORY = 'Benchmark'
+TEST_CLASS = 'performance'
+TEST_TYPE = 'server'
DOC = """
This server side test suite executes the Telemetry smoothness measurement test
diff --git a/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_pinch_zoom_cases b/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_pinch_zoom_cases
index 68f6757..c1d1af1 100644
--- a/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_pinch_zoom_cases
+++ b/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_pinch_zoom_cases
@@ -4,13 +4,13 @@
from autotest_lib.client.common_lib import utils
-AUTHOR = "sbasi, achuith, rohitbm"
-NAME = "telemetry_Benchmarks.smoothness.tough_pinch_zoom_cases"
-SUITE = "bvt-perbuild"
-TIME = "LONG"
-TEST_CATEGORY = "Benchmark"
-TEST_CLASS = "performance"
-TEST_TYPE = "server"
+AUTHOR = 'sbasi, achuith, rohitbm'
+NAME = 'telemetry_Benchmarks.smoothness.tough_pinch_zoom_cases'
+SUITE = 'performance'
+TIME = 'LONG'
+TEST_CATEGORY = 'Benchmark'
+TEST_CLASS = 'performance'
+TEST_TYPE = 'server'
DOC = """
This server side test suite executes the Telemetry smoothness measurement test
diff --git a/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_scrolling_cases b/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_scrolling_cases
index 00d2a9c..6ec516a 100644
--- a/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_scrolling_cases
+++ b/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_scrolling_cases
@@ -4,13 +4,13 @@
from autotest_lib.client.common_lib import utils
-AUTHOR = "sbasi, achuith, rohitbm"
-NAME = "telemetry_Benchmarks.smoothness.tough_scrolling_cases"
-SUITE = "bvt-perbuild"
-TIME = "LONG"
-TEST_CATEGORY = "Benchmark"
-TEST_CLASS = "performance"
-TEST_TYPE = "server"
+AUTHOR = 'sbasi, achuith, rohitbm'
+NAME = 'telemetry_Benchmarks.smoothness.tough_scrolling_cases'
+SUITE = 'performance'
+TIME = 'LONG'
+TEST_CATEGORY = 'Benchmark'
+TEST_CLASS = 'performance'
+TEST_TYPE = 'server'
DOC = """
This server side test suite executes the Telemetry smoothness measurement test
diff --git a/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_webgl_cases b/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_webgl_cases
index c353d58..473ac7d 100644
--- a/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_webgl_cases
+++ b/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_webgl_cases
@@ -4,13 +4,13 @@
from autotest_lib.client.common_lib import utils
-AUTHOR = "sbasi, achuith, rohitbm"
-NAME = "telemetry_Benchmarks.smoothness.tough_webgl_cases"
-SUITE = "bvt-perbuild"
-TIME = "LONG"
-TEST_CATEGORY = "Benchmark"
-TEST_CLASS = "performance"
-TEST_TYPE = "server"
+AUTHOR = 'sbasi, achuith, rohitbm'
+NAME = 'telemetry_Benchmarks.smoothness.tough_webgl_cases'
+SUITE = 'performance'
+TIME = 'LONG'
+TEST_CATEGORY = 'Benchmark'
+TEST_CLASS = 'performance'
+TEST_TYPE = 'server'
DOC = """
This server side test suite executes the Telemetry smoothness Benchmark
diff --git a/server/site_tests/telemetry_Benchmarks/control.speedometer b/server/site_tests/telemetry_Benchmarks/control.speedometer
new file mode 100644
index 0000000..921d237
--- /dev/null
+++ b/server/site_tests/telemetry_Benchmarks/control.speedometer
@@ -0,0 +1,32 @@
+# Copyright 2014 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Do not edit this file! It was created by generate_controlfiles.py.
+
+from autotest_lib.client.common_lib import utils
+
+AUTHOR = 'sbasi, achuith, rohitbm'
+NAME = 'telemetry_Benchmarks.speedometer'
+SUITE = 'performance'
+TIME = 'LONG'
+TEST_CATEGORY = 'Benchmark'
+TEST_CLASS = 'performance'
+TEST_TYPE = 'server'
+
+DOC = '''
+This server side test suite executes the Telemetry Benchmark:
+speedometer
+This is part of Chrome for Chrome OS performance testing.
+
+Pass local=True to run with local telemetry and no AFE server.
+'''
+
+def run_benchmark(machine):
+ host = hosts.create_host(machine)
+ job.run_test('telemetry_Benchmarks', host=host,
+ benchmark='speedometer',
+ tag='speedometer',
+ args=utils.args_to_dict(args))
+
+parallel_simple(run_benchmark, machines)
\ No newline at end of file
diff --git a/server/site_tests/telemetry_Benchmarks/control.startup.cold.blank_page b/server/site_tests/telemetry_Benchmarks/control.startup.cold.blank_page
index 0c4c3d8..7db2afe 100644
--- a/server/site_tests/telemetry_Benchmarks/control.startup.cold.blank_page
+++ b/server/site_tests/telemetry_Benchmarks/control.startup.cold.blank_page
@@ -4,13 +4,13 @@
from autotest_lib.client.common_lib import utils
-AUTHOR = "sbasi, achuith, rohitbm"
-NAME = "telemetry_Benchmarks.startup.cold.blank_page"
-SUITE = "bvt-perbuild"
-TIME = "LONG"
-TEST_CATEGORY = "Benchmark"
-TEST_CLASS = "performance"
-TEST_TYPE = "server"
+AUTHOR = 'sbasi, achuith, rohitbm'
+NAME = 'telemetry_Benchmarks.startup.cold.blank_page'
+SUITE = 'performance'
+TIME = 'LONG'
+TEST_CATEGORY = 'Benchmark'
+TEST_CLASS = 'performance'
+TEST_TYPE = 'server'
DOC = """
This server side test suite executes the Telemetry cold startup test
diff --git a/server/site_tests/telemetry_Benchmarks/control.sunspider b/server/site_tests/telemetry_Benchmarks/control.sunspider
index 24234ce..3d6bb29 100644
--- a/server/site_tests/telemetry_Benchmarks/control.sunspider
+++ b/server/site_tests/telemetry_Benchmarks/control.sunspider
@@ -4,13 +4,13 @@
from autotest_lib.client.common_lib import utils
-AUTHOR = "sbasi, achuith, rohitbm"
-NAME = "telemetry_Benchmarks.sunspider"
-SUITE = "bvt-perbuild"
-TIME = "LONG"
-TEST_CATEGORY = "Benchmark"
-TEST_CLASS = "performance"
-TEST_TYPE = "server"
+AUTHOR = 'sbasi, achuith, rohitbm'
+NAME = 'telemetry_Benchmarks.sunspider'
+SUITE = 'performance'
+TIME = 'LONG'
+TEST_CATEGORY = 'Benchmark'
+TEST_CLASS = 'performance'
+TEST_TYPE = 'server'
DOC = """
This server side test suite executes the Telemetry Sun Spider Benchmark.
diff --git a/server/site_tests/telemetry_Benchmarks/control.webrtc.webrtc_cases b/server/site_tests/telemetry_Benchmarks/control.webrtc.webrtc_cases
index 6912eb6..8f7526f 100644
--- a/server/site_tests/telemetry_Benchmarks/control.webrtc.webrtc_cases
+++ b/server/site_tests/telemetry_Benchmarks/control.webrtc.webrtc_cases
@@ -2,18 +2,20 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-AUTHOR = "chromeos-perf"
-NAME = "telemetry_Benchmarks.webrtc.webrtc_cases"
-SUITE = "perf_v2"
-TIME = "LONG"
-TEST_CATEGORY = "Benchmark"
-TEST_CLASS = "performance"
-TEST_TYPE = "server"
+from autotest_lib.client.common_lib import utils
-DOC = """
-This server side test suite executes the Telemetry WebRTC Benchmark.
-This is part of Chrome for Chrome OS performance testing.
-"""
+AUTHOR = 'sbasi, achuith, rohitbm'
+NAME = 'telemetry_Benchmarks.webrtc.webrtc_cases'
+SUITE = 'performance'
+TIME = 'LONG'
+TEST_CATEGORY = 'Benchmark'
+TEST_CLASS = 'performance'
+TEST_TYPE = 'server'
+
+DOC = '''
+This server side test suite executes the Telemetry Benchmark:
+webrtc.webrtc_cases
+'''
def run_benchmark(machine):
host = hosts.create_host(machine)
diff --git a/tko/perf_upload/perf_dashboard_config.json b/tko/perf_upload/perf_dashboard_config.json
index da2bb42..c51955a 100644
--- a/tko/perf_upload/perf_dashboard_config.json
+++ b/tko/perf_upload/perf_dashboard_config.json
@@ -343,6 +343,11 @@
"dashboard_test_name": "dromaeo.domcoretraverse"
},
{
+ "autotest_name": "telemetry_Benchmarks.jetstream",
+ "master_name": "ChromeOSPerf",
+ "dashboard_test_name": "jetstream"
+ },
+ {
"autotest_name": "telemetry_Benchmarks.kraken",
"master_name": "ChromeOSPerf",
"dashboard_test_name": "kraken"
@@ -418,6 +423,11 @@
"dashboard_test_name": "smoothness.tough_webgl_cases"
},
{
+ "autotest_name": "telemetry_Benchmarks.speedometer",
+ "master_name": "ChromeOSPerf",
+ "dashboard_test_name": "speedometer"
+ },
+ {
"autotest_name": "telemetry_Benchmarks.startup.cold.blank_page",
"master_name": "ChromeOSPerf",
"dashboard_test_name": "startup.cold.blank_page"
