[Scheduler]Creating a suite for Marlin/Sailfish.
This suite will run wpa2psk alone on days 0 & 1.
Also changing the batch size back to 12 and increasing the
SSID_MAX_COUNT(this seemed good for the previous batch size,
increasing it by 10).
While here, also changed the android_wifi_connect suite times
to 04:00hrs.
BUG=None
TEST=None
Change-Id: I823bca07d9217ad83454c2f58eabe91bc0397efa
Reviewed-on: https://chromium-review.googlesource.com/371341
Reviewed-by: Bindu Mahadev <bmahadev@chromium.org>
Commit-Queue: Bindu Mahadev <bmahadev@chromium.org>
Tested-by: Bindu Mahadev <bmahadev@chromium.org>
diff --git a/client/common_lib/cros/network/ap_constants.py b/client/common_lib/cros/network/ap_constants.py
index d61c1d8..87c017b 100644
--- a/client/common_lib/cros/network/ap_constants.py
+++ b/client/common_lib/cros/network/ap_constants.py
@@ -23,5 +23,5 @@
# This constant is used by the chaos_runner to determine maximum APs/SSIDs
# that are up in the lab.
-MAX_SSID_COUNT = 30
+MAX_SSID_COUNT = 40
MAX_SCAN_TIMEOUT = 30
diff --git a/server/cros/chaos_lib/chaos_runner.py b/server/cros/chaos_lib/chaos_runner.py
index d551263..4c3c074 100644
--- a/server/cros/chaos_lib/chaos_runner.py
+++ b/server/cros/chaos_lib/chaos_runner.py
@@ -49,7 +49,7 @@
logging.info('DUT time: %s', self._host.run('date').stdout.strip())
- def run(self, job, batch_size=7, tries=10, capturer_hostname=None,
+ def run(self, job, batch_size=12, tries=10, capturer_hostname=None,
conn_worker=None, work_client_hostname=None,
disabled_sysinfo=False):
"""Executes Chaos test.
diff --git a/server/site_tests/network_WiFi_ChaosConnectDisconnect/control.wpa2psk b/server/site_tests/network_WiFi_ChaosConnectDisconnect/control.wpa2psk
index ec956d1..83d740a 100644
--- a/server/site_tests/network_WiFi_ChaosConnectDisconnect/control.wpa2psk
+++ b/server/site_tests/network_WiFi_ChaosConnectDisconnect/control.wpa2psk
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_ChaosConnectDisconnect.wpa2psk'
TIME = 'LONG'
TEST_TYPE = 'server'
-ATTRIBUTES = 'suite:wifi_interop, suite:android_wifi_interop'
+ATTRIBUTES = ('suite:wifi_interop, suite:android_wifi_interop, '
+ 'suite:wifi_interop_wpa2')
DEPENDENCIES = 'chaos_nightly, chaos_dut'
DOC = """
diff --git a/site_utils/attribute_whitelist.txt b/site_utils/attribute_whitelist.txt
index 3c6da66..d819119 100644
--- a/site_utils/attribute_whitelist.txt
+++ b/site_utils/attribute_whitelist.txt
@@ -148,6 +148,7 @@
suite:wifi_endtoend
suite:wifi_flaky
suite:wifi_interop
+suite:wifi_interop_wpa2
suite:wifi_lucidsleep
suite:wifi_matfunc
suite:wifi_matfunc_bcm4371
diff --git a/suite_scheduler.ini b/suite_scheduler.ini
index 518e33f..a250e60 100644
--- a/suite_scheduler.ini
+++ b/suite_scheduler.ini
@@ -474,9 +474,27 @@
targets: marlin-userdebug
pool:wifichaos_marlin
+[WiFi_Interop_wpa2Sailfish]
+run_on: weekly
+day: 0
+suite: wifi_interop_wpa2
+os_type: android
+branches: git_nyc-mr1-release
+targets: sailfish-userdebug
+pool:wifichaos_sailfish
+
+[WiFi_Interop_wpa2Marlin]
+run_on: weekly
+day: 1
+suite: wifi_interop_wpa2
+os_type: android
+branches: git_nyc-mr1-release
+targets: marlin-userdebug
+pool:wifichaos_marlin
+
[WiFi_Connect_Angler]
run_on: nightly
-hour: 20
+hour: 4
suite: android_wifi_connect
os_type: android
branches: git_nyc-mr1-release
@@ -486,7 +504,7 @@
[WiFi_Connect_Bullhead]
run_on: nightly
-hour: 20
+hour: 4
suite: android_wifi_connect
os_type: android
branches: git_nyc-mr1-release
@@ -496,7 +514,7 @@
[WiFi_Connect_Marlin]
run_on: nightly
-hour: 20
+hour: 4
suite: android_wifi_connect
os_type: android
branches: git_nyc-mr1-release
diff --git a/test_suites/control.wifi_interop_wpa2 b/test_suites/control.wifi_interop_wpa2
new file mode 100644
index 0000000..e263072
--- /dev/null
+++ b/test_suites/control.wifi_interop_wpa2
@@ -0,0 +1,38 @@
+# Copyright 2016 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, tienchang, krisr'
+NAME = 'wifi_interop_wpa2'
+PURPOSE = 'Test WiFi interoperability across third-party consumer APs.'
+TIME = 'LONG'
+TEST_TYPE = 'Server'
+
+DOC = """
+This test suite runs against pre-determined DUTs and APs to capture failures
+in connection attempts.
+
+@param build: The name of the image to test.
+ Ex: git_nyc-release/bullhead-userdebug/LATEST
+@param board: The board to test on. Ex: android-bullhead
+@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
+
+args_dict['add_experimental'] = True
+args_dict['max_runtime_mins'] = 1440
+args_dict['timeout_mins'] = 1440
+args_dict['suite_dependencies'] = 'chaos_nightly'
+args_dict['version_prefix'] = provision.ANDROID_BUILD_VERSION_PREFIX
+args_dict['name'] = NAME
+args_dict['job'] = job
+
+dynamic_suite.reimage_and_run(**args_dict)
