Rename suite performance to crosbolt_perbuild and performance_optional
to crosbolt_nightly.
This is part one of a two part CL, removal of the old suite
definition will happen when all branches are no longer using it.
BUG=chromium:483125
TEST=None
Change-Id: I0936046b3f7e59b098bb01382cf3cd410af24a0c
Reviewed-on: https://chromium-review.googlesource.com/268526
Tested-by: Keith Haddow <haddowk@chromium.org>
Reviewed-by: Rohit Makasana <rohitbm@chromium.org>
Commit-Queue: Keith Haddow <haddowk@chromium.org>
Reviewed-by: Keith Haddow <haddowk@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/268687
diff --git a/client/site_tests/build_RootFilesystemSize/control b/client/site_tests/build_RootFilesystemSize/control
index c5d83b9..74e836b 100644
--- a/client/site_tests/build_RootFilesystemSize/control
+++ b/client/site_tests/build_RootFilesystemSize/control
@@ -8,7 +8,7 @@
CRITERIA = """
This test will fail if the size of the rootfs size cannot be obtained.
"""
-SUITE = "bvt-inline,performance"
+SUITE = "bvt-inline,crosbolt_perf_perbuild"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "build"
diff --git a/client/site_tests/graphics_WebGLAquarium/control b/client/site_tests/graphics_WebGLAquarium/control
index 4e8b391..f70b3c0 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 = 'performance, graphics, graphics_browser'
+SUITE = 'crosbolt_perf_perbuild, 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 8f8669a..46d70f6 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 = "performance_optional"
+SUITE = "crosbolt_perf_nightly"
TIME = "SHORT"
TEST_CATEGORY = "Benchmark"
TEST_CLASS = "platform"
diff --git a/client/site_tests/power_Resume/control b/client/site_tests/power_Resume/control
index 0b80b16..10a2ef7 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 = "performance"
+SUITE = "crosbolt_perf_perbuild"
TIME = "SHORT"
TEST_CATEGORY = "Logging"
TEST_CLASS = "power"
diff --git a/client/site_tests/video_PlaybackPerf/control.h264 b/client/site_tests/video_PlaybackPerf/control.h264
index b197a46..f23ca0b 100644
--- a/client/site_tests/video_PlaybackPerf/control.h264
+++ b/client/site_tests/video_PlaybackPerf/control.h264
@@ -8,7 +8,7 @@
CRITERIA = """
The test outputs the cpu usage and dropped frame count of H264 video playback.
"""
-SUITE = "video"
+SUITE = "crosbolt_perf_perbuild"
TIME = "MEDIUM"
TEST_CATEGORY = "Performance"
TEST_CLASS = "video"
diff --git a/client/site_tests/video_PlaybackPerf/control.h264.4k b/client/site_tests/video_PlaybackPerf/control.h264.4k
index db21b2b..5441061 100644
--- a/client/site_tests/video_PlaybackPerf/control.h264.4k
+++ b/client/site_tests/video_PlaybackPerf/control.h264.4k
@@ -9,7 +9,7 @@
The test outputs the cpu usage and dropped frame count of H264 4K video
playback.
"""
-SUITE = "video"
+SUITE = "crosbolt_perf_nightly"
TIME = "MEDIUM"
TEST_CATEGORY = "Performance"
TEST_CLASS = "video"
diff --git a/client/site_tests/video_PlaybackPerf/control.vp8 b/client/site_tests/video_PlaybackPerf/control.vp8
index 2ee2b93..658ddc7 100644
--- a/client/site_tests/video_PlaybackPerf/control.vp8
+++ b/client/site_tests/video_PlaybackPerf/control.vp8
@@ -8,7 +8,7 @@
CRITERIA = """
The test outputs the cpu usage and dropped frame count of VP8 video playback.
"""
-SUITE = "video"
+SUITE = "crosbolt_perf_nightly"
TIME = "MEDIUM"
TEST_CATEGORY = "Performance"
TEST_CLASS = "video"
diff --git a/client/site_tests/video_PlaybackPerf/control.vp9 b/client/site_tests/video_PlaybackPerf/control.vp9
index 77a2654..ff94800 100644
--- a/client/site_tests/video_PlaybackPerf/control.vp9
+++ b/client/site_tests/video_PlaybackPerf/control.vp9
@@ -8,7 +8,7 @@
CRITERIA = """
The test outputs the cpu usage and dropped frame count of VP9 video playback.
"""
-SUITE = "video"
+SUITE = "crosbolt_perf_perbuild"
TIME = "MEDIUM"
TEST_CATEGORY = "Performance"
TEST_CLASS = "video"
diff --git a/client/site_tests/video_PlaybackPerf/control.vp9.4k b/client/site_tests/video_PlaybackPerf/control.vp9.4k
index 7b84620..9097ec9 100644
--- a/client/site_tests/video_PlaybackPerf/control.vp9.4k
+++ b/client/site_tests/video_PlaybackPerf/control.vp9.4k
@@ -8,7 +8,7 @@
CRITERIA = """
The test outputs the cpu usage and dropped frame count of VP9 4K video playback.
"""
-SUITE = "video"
+SUITE = "crosbolt_perf_nightly"
TIME = "MEDIUM"
TEST_CATEGORY = "Performance"
TEST_CLASS = "video"
diff --git a/client/site_tests/video_VDAPerf/control.h264 b/client/site_tests/video_VDAPerf/control.h264
index 71d20d8..ab21b24 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 = "performance_optional"
+SUITE = "crosbolt_perf_perbuild"
TIME = "SHORT"
TEST_CATEGORY = "Performance"
TEST_CLASS = "video"
diff --git a/client/site_tests/video_VDAPerf/control.h264.4k b/client/site_tests/video_VDAPerf/control.h264.4k
index dc60791..e78a367 100644
--- a/client/site_tests/video_VDAPerf/control.h264.4k
+++ b/client/site_tests/video_VDAPerf/control.h264.4k
@@ -8,7 +8,7 @@
CRITERIA = """
The test fails if the video_decode_accelerator_unittest fails or crashes.
"""
-SUITE = "video"
+SUITE = "crosbolt_perf_nightly"
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 3218a33..6c3fb85 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 = "performance_optional"
+SUITE = "crosbolt_perf_nightly"
TIME = "SHORT"
TEST_CATEGORY = "Performance"
TEST_CLASS = "video"
diff --git a/client/site_tests/video_VDAPerf/control.vp8.4k b/client/site_tests/video_VDAPerf/control.vp8.4k
index 7a1762b..2401f0e 100644
--- a/client/site_tests/video_VDAPerf/control.vp8.4k
+++ b/client/site_tests/video_VDAPerf/control.vp8.4k
@@ -8,7 +8,7 @@
CRITERIA = """
The test fails if the video_decode_accelerator_unittest fails or crashes.
"""
-SUITE = "video"
+SUITE = "crosbolt_perf_nightly"
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 9fd1b00..43a4528 100644
--- a/client/site_tests/video_WebRtcPerf/control
+++ b/client/site_tests/video_WebRtcPerf/control
@@ -6,7 +6,7 @@
NAME = "video_WebRtcPerf"
PURPOSE = "Measure the CPU usage and decode time of WebRTC"
CRITERIA = "This is a performance test and does not fail."
-SUITE = "performance"
+SUITE = "crosbolt_perf_perbuild"
TIME = "MEDIUM"
TEST_CATEGORY = "Performance"
TEST_CLASS = "video"
diff --git a/server/site_tests/platform_BootPerfServer/control.crosperf b/server/site_tests/platform_BootPerfServer/control.crosperf
index 65b28b1..fe1fc8a 100644
--- a/server/site_tests/platform_BootPerfServer/control.crosperf
+++ b/server/site_tests/platform_BootPerfServer/control.crosperf
@@ -4,7 +4,7 @@
NAME = "BootPerfServerCrosPerf"
AUTHOR = "Chrome OS Team"
-SUITE = "performance"
+SUITE = "crosbolt_perf_perbuild"
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 645195d..e40abe5 100644
--- a/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoreattr
+++ b/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoreattr
@@ -8,7 +8,7 @@
AUTHOR = 'sbasi, achuith, rohitbm'
NAME = 'telemetry_Benchmarks.dromaeo.domcoreattr'
-SUITE = 'performance_optional'
+SUITE = 'crosbolt_perf_nightly'
TIME = 'LONG'
TEST_CATEGORY = 'Benchmark'
TEST_CLASS = 'performance'
diff --git a/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoremodify b/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoremodify
index 48cae36..ed55dde 100644
--- a/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoremodify
+++ b/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoremodify
@@ -8,7 +8,7 @@
AUTHOR = 'sbasi, achuith, rohitbm'
NAME = 'telemetry_Benchmarks.dromaeo.domcoremodify'
-SUITE = 'performance_optional'
+SUITE = 'crosbolt_perf_nightly'
TIME = 'LONG'
TEST_CATEGORY = 'Benchmark'
TEST_CLASS = 'performance'
diff --git a/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcorequery b/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcorequery
index 1823472..d3be349 100644
--- a/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcorequery
+++ b/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcorequery
@@ -8,7 +8,7 @@
AUTHOR = 'sbasi, achuith, rohitbm'
NAME = 'telemetry_Benchmarks.dromaeo.domcorequery'
-SUITE = 'performance_optional'
+SUITE = 'crosbolt_perf_nightly'
TIME = 'LONG'
TEST_CATEGORY = 'Benchmark'
TEST_CLASS = 'performance'
diff --git a/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoretraverse b/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoretraverse
index a6dbfb2..92dc6df 100644
--- a/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoretraverse
+++ b/server/site_tests/telemetry_Benchmarks/control.dromaeo.domcoretraverse
@@ -8,7 +8,7 @@
AUTHOR = 'sbasi, achuith, rohitbm'
NAME = 'telemetry_Benchmarks.dromaeo.domcoretraverse'
-SUITE = 'performance_optional'
+SUITE = 'crosbolt_perf_nightly'
TIME = 'LONG'
TEST_CATEGORY = 'Benchmark'
TEST_CLASS = 'performance'
diff --git a/server/site_tests/telemetry_Benchmarks/control.jetstream b/server/site_tests/telemetry_Benchmarks/control.jetstream
index 4ac91a9..4b08fc8 100644
--- a/server/site_tests/telemetry_Benchmarks/control.jetstream
+++ b/server/site_tests/telemetry_Benchmarks/control.jetstream
@@ -8,7 +8,7 @@
AUTHOR = 'sbasi, achuith, rohitbm'
NAME = 'telemetry_Benchmarks.jetstream'
-SUITE = 'performance'
+SUITE = 'crosbolt_perf_perbuild'
TIME = 'LONG'
TEST_CATEGORY = 'Benchmark'
TEST_CLASS = 'performance'
@@ -29,4 +29,4 @@
tag='jetstream',
args=utils.args_to_dict(args))
-parallel_simple(run_benchmark, machines)
\ No newline at end of file
+parallel_simple(run_benchmark, machines)
diff --git a/server/site_tests/telemetry_Benchmarks/control.kraken b/server/site_tests/telemetry_Benchmarks/control.kraken
index fa951e6..4354aa7 100644
--- a/server/site_tests/telemetry_Benchmarks/control.kraken
+++ b/server/site_tests/telemetry_Benchmarks/control.kraken
@@ -8,7 +8,7 @@
AUTHOR = 'sbasi, achuith, rohitbm'
NAME = 'telemetry_Benchmarks.kraken'
-SUITE = 'performance'
+SUITE = 'crosbolt_perf_perbuild'
TIME = 'LONG'
TEST_CATEGORY = 'Benchmark'
TEST_CLASS = 'performance'
@@ -29,4 +29,4 @@
tag='kraken',
args=utils.args_to_dict(args))
-parallel_simple(run_benchmark, machines)
\ No newline at end of file
+parallel_simple(run_benchmark, machines)
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 d17c02f..8bb522b 100644
--- a/server/site_tests/telemetry_Benchmarks/control.memory.top_7_stress
+++ b/server/site_tests/telemetry_Benchmarks/control.memory.top_7_stress
@@ -8,6 +8,7 @@
AUTHOR = 'sbasi, achuith, rohitbm'
NAME = 'telemetry_Benchmarks.memory.top_7_stress'
+SUITE = 'crosbolt_perf_nightly'
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 34767cb..13cb5f5 100644
--- a/server/site_tests/telemetry_Benchmarks/control.octane
+++ b/server/site_tests/telemetry_Benchmarks/control.octane
@@ -8,7 +8,7 @@
AUTHOR = 'sbasi, achuith, rohitbm'
NAME = 'telemetry_Benchmarks.octane'
-SUITE = 'performance'
+SUITE = 'crosbolt_perf_perbuild'
TIME = 'LONG'
TEST_CATEGORY = 'Benchmark'
TEST_CLASS = 'performance'
@@ -29,4 +29,4 @@
tag='octane',
args=utils.args_to_dict(args))
-parallel_simple(run_benchmark, machines)
\ No newline at end of file
+parallel_simple(run_benchmark, machines)
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 292d7b9..c2236e3 100644
--- a/server/site_tests/telemetry_Benchmarks/control.page_cycler.typical_25
+++ b/server/site_tests/telemetry_Benchmarks/control.page_cycler.typical_25
@@ -8,7 +8,7 @@
AUTHOR = 'sbasi, achuith, rohitbm'
NAME = 'telemetry_Benchmarks.page_cycler.typical_25'
-SUITE = 'performance'
+SUITE = 'crosbolt_perf_perbuild'
TIME = 'LONG'
TEST_CATEGORY = 'Benchmark'
TEST_CLASS = 'performance'
@@ -29,4 +29,4 @@
tag='page_cycler.typical_25',
args=utils.args_to_dict(args))
-parallel_simple(run_benchmark, machines)
\ No newline at end of file
+parallel_simple(run_benchmark, machines)
diff --git a/server/site_tests/telemetry_Benchmarks/control.robohornet_pro b/server/site_tests/telemetry_Benchmarks/control.robohornet_pro
index de146d1..2f70bba 100644
--- a/server/site_tests/telemetry_Benchmarks/control.robohornet_pro
+++ b/server/site_tests/telemetry_Benchmarks/control.robohornet_pro
@@ -8,7 +8,7 @@
AUTHOR = 'sbasi, achuith, rohitbm'
NAME = 'telemetry_Benchmarks.robohornet_pro'
-SUITE = 'performance_optional'
+SUITE = 'crosbolt_perf_nightly'
TIME = 'LONG'
TEST_CATEGORY = 'Benchmark'
TEST_CLASS = 'performance'
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 cedcfd6..c8b760f 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
@@ -8,6 +8,7 @@
AUTHOR = 'sbasi, achuith, rohitbm'
NAME = 'telemetry_Benchmarks.session_restore.cold.typical_25'
+SUITE = 'crosbolt_perf_perbuild'
TIME = 'LONG'
TEST_CATEGORY = 'Benchmark'
TEST_CLASS = 'performance'
diff --git a/server/site_tests/telemetry_Benchmarks/control.smoothness.top_25_smooth b/server/site_tests/telemetry_Benchmarks/control.smoothness.top_25_smooth
index 46c9dc7..749fee2 100644
--- a/server/site_tests/telemetry_Benchmarks/control.smoothness.top_25_smooth
+++ b/server/site_tests/telemetry_Benchmarks/control.smoothness.top_25_smooth
@@ -8,7 +8,7 @@
AUTHOR = 'sbasi, achuith, rohitbm'
NAME = 'telemetry_Benchmarks.smoothness.top_25_smooth'
-SUITE = 'performance'
+SUITE = 'crosbolt_perf_perbuild'
TIME = 'LONG'
TEST_CATEGORY = 'Benchmark'
TEST_CLASS = 'performance'
@@ -29,4 +29,4 @@
tag='smoothness.top_25_smooth',
args=utils.args_to_dict(args))
-parallel_simple(run_benchmark, machines)
\ No newline at end of file
+parallel_simple(run_benchmark, machines)
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 f4d4bdc..7aff2a5 100644
--- a/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_animation_cases
+++ b/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_animation_cases
@@ -8,7 +8,7 @@
AUTHOR = 'sbasi, achuith, rohitbm'
NAME = 'telemetry_Benchmarks.smoothness.tough_animation_cases'
-SUITE = 'performance_optional'
+SUITE = 'crosbolt_perf_nightly'
TIME = 'LONG'
TEST_CATEGORY = 'Benchmark'
TEST_CLASS = 'performance'
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 aa94a12..c5cd60f 100644
--- a/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_canvas_cases
+++ b/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_canvas_cases
@@ -8,7 +8,7 @@
AUTHOR = 'sbasi, achuith, rohitbm'
NAME = 'telemetry_Benchmarks.smoothness.tough_canvas_cases'
-SUITE = 'performance_optional'
+SUITE = 'crosbolt_perf_nightly'
TIME = 'LONG'
TEST_CATEGORY = 'Benchmark'
TEST_CLASS = 'performance'
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 f44e8a3..f9b777d 100644
--- a/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_filters_cases
+++ b/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_filters_cases
@@ -8,7 +8,7 @@
AUTHOR = 'sbasi, achuith, rohitbm'
NAME = 'telemetry_Benchmarks.smoothness.tough_filters_cases'
-SUITE = 'performance_optional'
+SUITE = 'crosbolt_perf_nightly'
TIME = 'LONG'
TEST_CATEGORY = 'Benchmark'
TEST_CLASS = 'performance'
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 c862436..274694a 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
@@ -8,7 +8,7 @@
AUTHOR = 'sbasi, achuith, rohitbm'
NAME = 'telemetry_Benchmarks.smoothness.tough_pinch_zoom_cases'
-SUITE = 'performance_optional'
+SUITE = 'crosbolt_perf_nightly'
TIME = 'LONG'
TEST_CATEGORY = 'Benchmark'
TEST_CLASS = 'performance'
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 d2650c5..2f595a4 100644
--- a/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_scrolling_cases
+++ b/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_scrolling_cases
@@ -8,7 +8,7 @@
AUTHOR = 'sbasi, achuith, rohitbm'
NAME = 'telemetry_Benchmarks.smoothness.tough_scrolling_cases'
-SUITE = 'performance_optional'
+SUITE = 'crosbolt_perf_nightly'
TIME = 'LONG'
TEST_CATEGORY = 'Benchmark'
TEST_CLASS = 'performance'
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 cb39c03..a862155 100644
--- a/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_webgl_cases
+++ b/server/site_tests/telemetry_Benchmarks/control.smoothness.tough_webgl_cases
@@ -8,7 +8,7 @@
AUTHOR = 'sbasi, achuith, rohitbm'
NAME = 'telemetry_Benchmarks.smoothness.tough_webgl_cases'
-SUITE = 'performance'
+SUITE = 'crosbolt_perf_nightly'
TIME = 'LONG'
TEST_CATEGORY = 'Benchmark'
TEST_CLASS = 'performance'
@@ -29,4 +29,4 @@
tag='smoothness.tough_webgl_cases',
args=utils.args_to_dict(args))
-parallel_simple(run_benchmark, machines)
\ No newline at end of file
+parallel_simple(run_benchmark, machines)
diff --git a/server/site_tests/telemetry_Benchmarks/control.speedometer b/server/site_tests/telemetry_Benchmarks/control.speedometer
index 921d237..4cb7c38 100644
--- a/server/site_tests/telemetry_Benchmarks/control.speedometer
+++ b/server/site_tests/telemetry_Benchmarks/control.speedometer
@@ -8,7 +8,7 @@
AUTHOR = 'sbasi, achuith, rohitbm'
NAME = 'telemetry_Benchmarks.speedometer'
-SUITE = 'performance'
+SUITE = 'crosbolt_perf_perbuild'
TIME = 'LONG'
TEST_CATEGORY = 'Benchmark'
TEST_CLASS = 'performance'
@@ -29,4 +29,4 @@
tag='speedometer',
args=utils.args_to_dict(args))
-parallel_simple(run_benchmark, machines)
\ No newline at end of file
+parallel_simple(run_benchmark, machines)
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 d089e2a..01b1562 100644
--- a/server/site_tests/telemetry_Benchmarks/control.startup.cold.blank_page
+++ b/server/site_tests/telemetry_Benchmarks/control.startup.cold.blank_page
@@ -8,7 +8,7 @@
AUTHOR = 'sbasi, achuith, rohitbm'
NAME = 'telemetry_Benchmarks.startup.cold.blank_page'
-SUITE = 'performance'
+SUITE = 'crosbolt_perf_perbuild'
TIME = 'LONG'
TEST_CATEGORY = 'Benchmark'
TEST_CLASS = 'performance'
@@ -29,4 +29,4 @@
tag='startup.cold.blank_page',
args=utils.args_to_dict(args))
-parallel_simple(run_benchmark, machines)
\ No newline at end of file
+parallel_simple(run_benchmark, machines)
diff --git a/server/site_tests/telemetry_Benchmarks/control.sunspider b/server/site_tests/telemetry_Benchmarks/control.sunspider
index 403eba5..678904e 100644
--- a/server/site_tests/telemetry_Benchmarks/control.sunspider
+++ b/server/site_tests/telemetry_Benchmarks/control.sunspider
@@ -8,7 +8,7 @@
AUTHOR = 'sbasi, achuith, rohitbm'
NAME = 'telemetry_Benchmarks.sunspider'
-SUITE = 'performance_optional'
+SUITE = 'crosbolt_perf_nightly'
TIME = 'LONG'
TEST_CATEGORY = 'Benchmark'
TEST_CLASS = 'performance'
diff --git a/server/site_tests/telemetry_Benchmarks/control.tab_switching.top_10 b/server/site_tests/telemetry_Benchmarks/control.tab_switching.top_10
index 8474f09..5338faf 100644
--- a/server/site_tests/telemetry_Benchmarks/control.tab_switching.top_10
+++ b/server/site_tests/telemetry_Benchmarks/control.tab_switching.top_10
@@ -8,7 +8,7 @@
AUTHOR = 'sbasi, achuith, rohitbm'
NAME = 'telemetry_Benchmarks.tab_switching.top_10'
-SUITE = 'performance'
+SUITE = 'crosbolt_perf_nightly'
TIME = 'LONG'
TEST_CATEGORY = 'Benchmark'
TEST_CLASS = 'performance'
@@ -29,4 +29,4 @@
tag='tab_switching.top_10',
args=utils.args_to_dict(args))
-parallel_simple(run_benchmark, machines)
\ No newline at end of file
+parallel_simple(run_benchmark, machines)
diff --git a/server/site_tests/telemetry_Benchmarks/control.webrtc.webrtc_cases b/server/site_tests/telemetry_Benchmarks/control.webrtc.webrtc_cases
index 2f9883d..6bc4469 100644
--- a/server/site_tests/telemetry_Benchmarks/control.webrtc.webrtc_cases
+++ b/server/site_tests/telemetry_Benchmarks/control.webrtc.webrtc_cases
@@ -8,7 +8,7 @@
AUTHOR = 'sbasi, achuith, rohitbm'
NAME = 'telemetry_Benchmarks.webrtc.webrtc_cases'
-SUITE = 'performance_optional'
+SUITE = 'crosbolt_perf_nightly'
TIME = 'LONG'
TEST_CATEGORY = 'Benchmark'
TEST_CLASS = 'performance'
diff --git a/server/site_tests/telemetry_Benchmarks/generate_controlfiles.py b/server/site_tests/telemetry_Benchmarks/generate_controlfiles.py
index ff1b0e0..3047c3a 100644
--- a/server/site_tests/telemetry_Benchmarks/generate_controlfiles.py
+++ b/server/site_tests/telemetry_Benchmarks/generate_controlfiles.py
@@ -47,7 +47,7 @@
AUTHOR = 'sbasi, achuith, rohitbm'
NAME = 'telemetry_Benchmarks.{0}'
-SUITE = 'performance'
+SUITE = 'crosbolt_perf_nightly'
TIME = 'LONG'
TEST_CATEGORY = 'Benchmark'
TEST_CLASS = 'performance'
diff --git a/suite_scheduler.ini b/suite_scheduler.ini
index eb94cb8..da6911d 100644
--- a/suite_scheduler.ini
+++ b/suite_scheduler.ini
@@ -743,3 +743,21 @@
branch_specs: ==tot-1
pool: performance
file_bugs: True
+
+# Please do not add tests to this suite without first clearing it with the
+# crosbolt team.
+[CrosboltPerfPerbuild]
+run_on: new_build
+suite: crosbolt_perf_perbuild
+branch_specs: >=tot-2
+pool: performance
+file_bugs: True
+
+# Please do not add tests to this suite without first clearing it with the
+# crosbolt team.
+[CrosboltPerfNightly]
+run_on: nightly
+suite: crosbolt_perf_nightly
+branch_specs: >=tot-1
+pool: performance
+file_bugs: True
diff --git a/test_suites/control.crosbolt_perf_nightly b/test_suites/control.crosbolt_perf_nightly
new file mode 100644
index 0000000..7688a71
--- /dev/null
+++ b/test_suites/control.crosbolt_perf_nightly
@@ -0,0 +1,48 @@
+# Copyright 2015 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.
+
+AUTHOR = "rohitbm@chromium.org, chromeos-performance@google.com"
+NAME = "crosbolt_perf_nightly"
+PURPOSE = "Performance tests"
+CRITERIA = "All tests with SUITE=crosbolt_perf_nightly must pass."
+
+TIME = "LONG"
+TEST_CATEGORY = "General"
+TEST_CLASS = "suite"
+TEST_TYPE = "Server"
+
+DOC = """
+ChromeOS performance tests including telemetry tests.
+
+@param build: The name of the image to test.
+ Ex: x86-mario-release/R17-1412.33.0-a1-b29
+@param board: The board to test on. Ex: x86-mario
+@param pool: The pool of machines to utilize for scheduling. If pool=None
+ board is used.
+@param check_hosts: require appropriate live hosts to exist in the lab.
+@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
+"""
+
+import common
+from autotest_lib.server.cros import provision
+from autotest_lib.server.cros.dynamic_suite import dynamic_suite
+
+
+# Values specified in this bug template will override default values when
+# filing bugs on tests that are a part of this suite. If left unspecified
+# the bug filer will fallback to its defaults.
+_BUG_TEMPLATE = {
+ 'labels': ['Type-Bug', 'Cros-Perf-Test'],
+ 'owner': 'rohitbm@chromium.org',
+ 'ccs': ['lafeenstra@chromium.org']
+}
+
+dynamic_suite.reimage_and_run(
+ build=build, board=board, name='crosbolt_perf_nightly', job=job, pool=pool,
+ check_hosts=check_hosts, add_experimental=True, num=num,
+ file_bugs=False, priority=priority, timeout_mins=480,
+ bug_template=_BUG_TEMPLATE, devserver_url=devserver_url,
+ version_prefix=provision.CROS_VERSION_PREFIX,
+ wait_for_results=wait_for_results, job_retry=job_retry,
+ max_retries=max_retries)
diff --git a/test_suites/control.crosbolt_perf_perbuild b/test_suites/control.crosbolt_perf_perbuild
new file mode 100644
index 0000000..ca0d4a8
--- /dev/null
+++ b/test_suites/control.crosbolt_perf_perbuild
@@ -0,0 +1,48 @@
+# 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.
+
+AUTHOR = "rohitbm@chromium.org, chromeos-performance@google.com"
+NAME = "crosbolt_perf_perbuild"
+PURPOSE = "Performance tests"
+CRITERIA = "All tests with SUITE=performance must pass."
+
+TIME = "LONG"
+TEST_CATEGORY = "General"
+TEST_CLASS = "suite"
+TEST_TYPE = "Server"
+
+DOC = """
+ChromeOS performance tests including telemetry tests.
+
+@param build: The name of the image to test.
+ Ex: x86-mario-release/R17-1412.33.0-a1-b29
+@param board: The board to test on. Ex: x86-mario
+@param pool: The pool of machines to utilize for scheduling. If pool=None
+ board is used.
+@param check_hosts: require appropriate live hosts to exist in the lab.
+@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
+"""
+
+import common
+from autotest_lib.server.cros import provision
+from autotest_lib.server.cros.dynamic_suite import dynamic_suite
+
+
+# Values specified in this bug template will override default values when
+# filing bugs on tests that are a part of this suite. If left unspecified
+# the bug filer will fallback to its defaults.
+_BUG_TEMPLATE = {
+ 'labels': ['Type-Bug', 'Cros-Perf-Test'],
+ 'owner': 'rohitbm@chromium.org',
+ 'ccs': ['lafeenstra@chromium.org']
+}
+
+dynamic_suite.reimage_and_run(
+ build=build, board=board, name='crosbolt_perf_perbuild', job=job, pool=pool,
+ check_hosts=check_hosts, add_experimental=True, num=num,
+ file_bugs=False, priority=priority, timeout_mins=480,
+ bug_template=_BUG_TEMPLATE, devserver_url=devserver_url,
+ version_prefix=provision.CROS_VERSION_PREFIX,
+ wait_for_results=wait_for_results, job_retry=job_retry,
+ max_retries=max_retries)
