Wifi_Perf suite per wifi module
Created 3 new suites for intel, marvell and broadcom, so
that these results can be monitored standalone on the perf
dashboard.
BUG=chromium:454915
TEST=None
DEPLOY=suite_scheduler
Change-Id: I511b5716cedfe5ce997f285c33cd1c8d23289789
Reviewed-on: https://chromium-review.googlesource.com/249362
Reviewed-by: Kris Rambish <krisr@chromium.org>
Commit-Queue: Bindu Mahadev <bmahadev@chromium.org>
Tested-by: Bindu Mahadev <bmahadev@chromium.org>
diff --git a/server/site_tests/network_WiFi_Perf/control.11a b/server/site_tests/network_WiFi_Perf/control.11a
index 2796ed5..ceabe8d 100644
--- a/server/site_tests/network_WiFi_Perf/control.11a
+++ b/server/site_tests/network_WiFi_Perf/control.11a
@@ -4,7 +4,8 @@
AUTHOR = 'wiley, pstew, quiche'
NAME = 'network_WiFi_Perf.11a'
-SUITE = 'wifi_perf'
+SUITE = ('wifi_perf, wifi_perf_bcm4356, wifi_perf_marvell8897,'
+ 'wifi_perf_intel7265')
TIME = 'SHORT'
TEST_TYPE = 'Server'
DEPENDENCIES = 'wificell'
diff --git a/server/site_tests/network_WiFi_Perf/control.11a_aes b/server/site_tests/network_WiFi_Perf/control.11a_aes
index 51e4fe1..960dae0 100644
--- a/server/site_tests/network_WiFi_Perf/control.11a_aes
+++ b/server/site_tests/network_WiFi_Perf/control.11a_aes
@@ -4,7 +4,8 @@
AUTHOR = 'wiley, pstew, quiche'
NAME = 'network_WiFi_Perf.11a_aes'
-SUITE = 'wifi_perf'
+SUITE = ('wifi_perf, wifi_perf_bcm4356, wifi_perf_marvell8897,'
+ 'wifi_perf_intel7265')
TIME = 'SHORT'
TEST_TYPE = 'Server'
DEPENDENCIES = 'wificell'
diff --git a/server/site_tests/network_WiFi_Perf/control.11a_tkip b/server/site_tests/network_WiFi_Perf/control.11a_tkip
index b64da18..8b2e90d 100644
--- a/server/site_tests/network_WiFi_Perf/control.11a_tkip
+++ b/server/site_tests/network_WiFi_Perf/control.11a_tkip
@@ -4,7 +4,8 @@
AUTHOR = 'wiley, pstew, quiche'
NAME = 'network_WiFi_Perf.11a_tkip'
-SUITE = 'wifi_perf'
+SUITE = ('wifi_perf, wifi_perf_bcm4356, wifi_perf_marvell8897,'
+ 'wifi_perf_intel7265')
TIME = 'SHORT'
TEST_TYPE = 'Server'
DEPENDENCIES = 'wificell'
diff --git a/server/site_tests/network_WiFi_Perf/control.11a_wep b/server/site_tests/network_WiFi_Perf/control.11a_wep
index 1a5448d..7d875c8 100644
--- a/server/site_tests/network_WiFi_Perf/control.11a_wep
+++ b/server/site_tests/network_WiFi_Perf/control.11a_wep
@@ -4,7 +4,8 @@
AUTHOR = 'wiley, pstew, quiche'
NAME = 'network_WiFi_Perf.11a_wep'
-SUITE = 'wifi_perf'
+SUITE = ('wifi_perf, wifi_perf_bcm4356, wifi_perf_marvell8897,'
+ 'wifi_perf_intel7265')
TIME = 'SHORT'
TEST_TYPE = 'Server'
DEPENDENCIES = 'wificell'
diff --git a/server/site_tests/network_WiFi_Perf/control.11b b/server/site_tests/network_WiFi_Perf/control.11b
index ea1cfc3..285307d 100644
--- a/server/site_tests/network_WiFi_Perf/control.11b
+++ b/server/site_tests/network_WiFi_Perf/control.11b
@@ -4,7 +4,8 @@
AUTHOR = 'wiley, pstew, quiche'
NAME = 'network_WiFi_Perf.11b'
-SUITE = 'wifi_perf'
+SUITE = ('wifi_perf, wifi_perf_bcm4356, wifi_perf_marvell8897,'
+ 'wifi_perf_intel7265')
TIME = 'SHORT'
TEST_TYPE = 'Server'
DEPENDENCIES = 'wificell'
diff --git a/server/site_tests/network_WiFi_Perf/control.11b_wep b/server/site_tests/network_WiFi_Perf/control.11b_wep
index 37ddf0d..e663750 100644
--- a/server/site_tests/network_WiFi_Perf/control.11b_wep
+++ b/server/site_tests/network_WiFi_Perf/control.11b_wep
@@ -4,7 +4,8 @@
AUTHOR = 'wiley, pstew, quiche'
NAME = 'network_WiFi_Perf.11b_wep'
-SUITE = 'wifi_perf'
+SUITE = ('wifi_perf, wifi_perf_bcm4356, wifi_perf_marvell8897,'
+ 'wifi_perf_intel7265')
TIME = 'SHORT'
TEST_TYPE = 'Server'
DEPENDENCIES = 'wificell'
diff --git a/server/site_tests/network_WiFi_Perf/control.11g b/server/site_tests/network_WiFi_Perf/control.11g
index 686c767..2ab93ea 100644
--- a/server/site_tests/network_WiFi_Perf/control.11g
+++ b/server/site_tests/network_WiFi_Perf/control.11g
@@ -4,7 +4,8 @@
AUTHOR = 'wiley, pstew, quiche'
NAME = 'network_WiFi_Perf.11g'
-SUITE = 'wifi_perf'
+SUITE = ('wifi_perf, wifi_perf_bcm4356, wifi_perf_marvell8897,'
+ 'wifi_perf_intel7265')
TIME = 'SHORT'
TEST_TYPE = 'Server'
DEPENDENCIES = 'wificell'
diff --git a/server/site_tests/network_WiFi_Perf/control.11g_aes b/server/site_tests/network_WiFi_Perf/control.11g_aes
index 8076fda..f41e1db 100644
--- a/server/site_tests/network_WiFi_Perf/control.11g_aes
+++ b/server/site_tests/network_WiFi_Perf/control.11g_aes
@@ -4,7 +4,8 @@
AUTHOR = 'wiley, pstew, quiche'
NAME = 'network_WiFi_Perf.11g_aes'
-SUITE = 'wifi_perf'
+SUITE = ('wifi_perf, wifi_perf_bcm4356, wifi_perf_marvell8897,'
+ 'wifi_perf_intel7265')
TIME = 'SHORT'
TEST_TYPE = 'Server'
DEPENDENCIES = 'wificell'
diff --git a/server/site_tests/network_WiFi_Perf/control.11g_tkip b/server/site_tests/network_WiFi_Perf/control.11g_tkip
index 72e451b..453fb42 100644
--- a/server/site_tests/network_WiFi_Perf/control.11g_tkip
+++ b/server/site_tests/network_WiFi_Perf/control.11g_tkip
@@ -4,7 +4,8 @@
AUTHOR = 'wiley, pstew, quiche'
NAME = 'network_WiFi_Perf.11g_tkip'
-SUITE = 'wifi_perf'
+SUITE = ('wifi_perf, wifi_perf_bcm4356, wifi_perf_marvell8897,'
+ 'wifi_perf_intel7265')
TIME = 'SHORT'
TEST_TYPE = 'Server'
DEPENDENCIES = 'wificell'
diff --git a/server/site_tests/network_WiFi_Perf/control.11g_wep b/server/site_tests/network_WiFi_Perf/control.11g_wep
index f32385a..94a4ad4 100644
--- a/server/site_tests/network_WiFi_Perf/control.11g_wep
+++ b/server/site_tests/network_WiFi_Perf/control.11g_wep
@@ -4,7 +4,8 @@
AUTHOR = 'wiley, pstew, quiche'
NAME = 'network_WiFi_Perf.11g_wep'
-SUITE = 'wifi_perf'
+SUITE = ('wifi_perf, wifi_perf_bcm4356, wifi_perf_marvell8897,'
+ 'wifi_perf_intel7265')
TIME = 'SHORT'
TEST_TYPE = 'Server'
DEPENDENCIES = 'wificell'
diff --git a/server/site_tests/network_WiFi_Perf/control.ht20 b/server/site_tests/network_WiFi_Perf/control.ht20
index bb931b0..1a71809 100644
--- a/server/site_tests/network_WiFi_Perf/control.ht20
+++ b/server/site_tests/network_WiFi_Perf/control.ht20
@@ -4,7 +4,8 @@
AUTHOR = 'wiley, pstew, quiche'
NAME = 'network_WiFi_Perf.ht20'
-SUITE = 'wifi_perf'
+SUITE = ('wifi_perf, wifi_perf_bcm4356, wifi_perf_marvell8897,'
+ 'wifi_perf_intel7265')
TIME = 'SHORT'
TEST_TYPE = 'Server'
DEPENDENCIES = 'wificell'
diff --git a/server/site_tests/network_WiFi_Perf/control.ht20_aes b/server/site_tests/network_WiFi_Perf/control.ht20_aes
index 94396ec..1d347ab 100644
--- a/server/site_tests/network_WiFi_Perf/control.ht20_aes
+++ b/server/site_tests/network_WiFi_Perf/control.ht20_aes
@@ -4,7 +4,8 @@
AUTHOR = 'wiley, pstew, quiche'
NAME = 'network_WiFi_Perf.ht20_aes'
-SUITE = 'wifi_perf'
+SUITE = ('wifi_perf, wifi_perf_bcm4356, wifi_perf_marvell8897,'
+ 'wifi_perf_intel7265')
TIME = 'SHORT'
TEST_TYPE = 'Server'
DEPENDENCIES = 'wificell'
diff --git a/server/site_tests/network_WiFi_Perf/control.ht40 b/server/site_tests/network_WiFi_Perf/control.ht40
index b0f0e06..82c992a 100644
--- a/server/site_tests/network_WiFi_Perf/control.ht40
+++ b/server/site_tests/network_WiFi_Perf/control.ht40
@@ -4,7 +4,8 @@
AUTHOR = 'wiley, pstew, quiche'
NAME = 'network_WiFi_Perf.ht40'
-SUITE = 'wifi_perf'
+SUITE = ('wifi_perf, wifi_perf_bcm4356, wifi_perf_marvell8897,'
+ 'wifi_perf_intel7265')
TIME = 'SHORT'
TEST_TYPE = 'Server'
DEPENDENCIES = 'wificell'
diff --git a/server/site_tests/network_WiFi_Perf/control.ht40_aes b/server/site_tests/network_WiFi_Perf/control.ht40_aes
index 36d2e49..6ff39bd 100644
--- a/server/site_tests/network_WiFi_Perf/control.ht40_aes
+++ b/server/site_tests/network_WiFi_Perf/control.ht40_aes
@@ -4,7 +4,8 @@
AUTHOR = 'wiley, pstew, quiche'
NAME = 'network_WiFi_Perf.ht40_aes'
-SUITE = 'wifi_perf'
+SUITE = ('wifi_perf, wifi_perf_bcm4356, wifi_perf_marvell8897,'
+ 'wifi_perf_intel7265')
TIME = 'SHORT'
TEST_TYPE = 'Server'
DEPENDENCIES = 'wificell'
diff --git a/server/site_tests/network_WiFi_Perf/control.vht80 b/server/site_tests/network_WiFi_Perf/control.vht80
index 4f49ecb..f440f3b 100644
--- a/server/site_tests/network_WiFi_Perf/control.vht80
+++ b/server/site_tests/network_WiFi_Perf/control.vht80
@@ -5,7 +5,8 @@
AUTHOR = 'wiley, pstew, quiche'
NAME = 'network_WiFi_Perf.vht80'
# Add to the suite when crbug.com/444207 is fixed
-# SUITE = 'wifi_perf'
+# SUITE = ('wifi_perf, wifi_perf_bcm4356, wifi_perf_marvell8897,'
+# 'wifi_perf_intel7265')
TIME = 'SHORT'
TEST_TYPE = 'Server'
DEPENDENCIES = 'wificell'
diff --git a/suite_scheduler.ini b/suite_scheduler.ini
index 714cb69..c10bd9b 100644
--- a/suite_scheduler.ini
+++ b/suite_scheduler.ini
@@ -283,6 +283,24 @@
branch_specs: ==tot
pool: wificell
+[WiFi_Perf]
+run_on: nightly
+suite: wifi_perf_bcm4356
+branch_specs: ==tot
+pool: wificell
+
+[WiFi_Perf]
+run_on: nightly
+suite: wifi_perf_marvell8897
+branch_specs: ==tot
+pool: wificell
+
+[WiFi_Perf]
+run_on: nightly
+suite: wifi_perf_intel7265
+branch_specs: ==tot
+pool: wificell
+
[WiFi_Attenuated_Performance]
run_on: nightly
suite: wifi_atten_perf
diff --git a/test_suites/control.wifi_perf_bcm4356 b/test_suites/control.wifi_perf_bcm4356
new file mode 100644
index 0000000..228030e
--- /dev/null
+++ b/test_suites/control.wifi_perf_bcm4356
@@ -0,0 +1,38 @@
+# 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 = 'bmahadev, krisr, tienchang'
+NAME = 'wifi_perf_bcm4356'
+PURPOSE = 'Measure WiFi performance'
+TIME = 'LONG'
+TEST_TYPE = 'Server'
+
+DOC = """
+This test configures a router in various ways, and measures WiFi performance
+of a test device connected to the router.
+
+@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.
+@param file_bugs: If True your suite will file bugs on failures.
+@param max_run_time: Amount of time each test shoud run in minutes.
+
+"""
+
+import common
+from autotest_lib.server.cros import provision
+from autotest_lib.server.cros.dynamic_suite import dynamic_suite
+
+dynamic_suite.reimage_and_run(
+ build=build, board=board, name=NAME, job=job, pool=pool,
+ check_hosts=check_hosts, add_experimental=True, num=num,
+ file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
+ max_runtime_mins=60, 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.wifi_perf_intel7265 b/test_suites/control.wifi_perf_intel7265
new file mode 100644
index 0000000..856aaa9
--- /dev/null
+++ b/test_suites/control.wifi_perf_intel7265
@@ -0,0 +1,38 @@
+# 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 = 'bmahadev, krisr, tienchang'
+NAME = 'wifi_perf_intel7265'
+PURPOSE = 'Measure WiFi performance'
+TIME = 'LONG'
+TEST_TYPE = 'Server'
+
+DOC = """
+This test configures a router in various ways, and measures WiFi performance
+of a test device connected to the router.
+
+@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.
+@param file_bugs: If True your suite will file bugs on failures.
+@param max_run_time: Amount of time each test shoud run in minutes.
+
+"""
+
+import common
+from autotest_lib.server.cros import provision
+from autotest_lib.server.cros.dynamic_suite import dynamic_suite
+
+dynamic_suite.reimage_and_run(
+ build=build, board=board, name=NAME, job=job, pool=pool,
+ check_hosts=check_hosts, add_experimental=True, num=num,
+ file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
+ max_runtime_mins=60, 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.wifi_perf_marvell8897 b/test_suites/control.wifi_perf_marvell8897
new file mode 100644
index 0000000..fe6b561
--- /dev/null
+++ b/test_suites/control.wifi_perf_marvell8897
@@ -0,0 +1,38 @@
+# 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 = 'bmahadev, krisr, tienchang'
+NAME = 'wifi_perf_marvell8897'
+PURPOSE = 'Measure WiFi performance'
+TIME = 'LONG'
+TEST_TYPE = 'Server'
+
+DOC = """
+This test configures a router in various ways, and measures WiFi performance
+of a test device connected to the router.
+
+@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.
+@param file_bugs: If True your suite will file bugs on failures.
+@param max_run_time: Amount of time each test shoud run in minutes.
+
+"""
+
+import common
+from autotest_lib.server.cros import provision
+from autotest_lib.server.cros.dynamic_suite import dynamic_suite
+
+dynamic_suite.reimage_and_run(
+ build=build, board=board, name=NAME, job=job, pool=pool,
+ check_hosts=check_hosts, add_experimental=True, num=num,
+ file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
+ max_runtime_mins=60, devserver_url=devserver_url,
+ version_prefix=provision.CROS_VERSION_PREFIX,
+ wait_for_results=wait_for_results, job_retry=job_retry,
+ max_retries=max_retries)