chaos: Create weekly runs of Chaos against our 5 major WiFi chipsets.
BUG=None
TEST=None
Change-Id: Ie913c188a519c4562cb641bbad79c18928819d14
Reviewed-on: https://chromium-review.googlesource.com/325341
Commit-Ready: Tien Chang <tienchang@chromium.org>
Tested-by: Tien Chang <tienchang@chromium.org>
Reviewed-by: Tien Chang <tienchang@chromium.org>
Reviewed-by: Kris Rambish <krisr@chromium.org>
diff --git a/server/site_tests/network_WiFi_ChaosConnectDisconnect/control.open b/server/site_tests/network_WiFi_ChaosConnectDisconnect/control.open
index be20ce3..ac5bc91 100644
--- a/server/site_tests/network_WiFi_ChaosConnectDisconnect/control.open
+++ b/server/site_tests/network_WiFi_ChaosConnectDisconnect/control.open
@@ -1,4 +1,4 @@
-# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
+# 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.
@@ -6,6 +6,9 @@
NAME = 'network_WiFi_ChaosConnectDisconnect.open'
TIME = 'LONG'
TEST_TYPE = 'server'
+ATTRIBUTES = 'suite:wifi_interop'
+SUITE = 'wifi_interop'
+DEPENDENCIES = 'chaos_nightly, chaos_dut'
DOC = """
This script iterates through all of the access points in the AP compatibility
diff --git a/server/site_tests/network_WiFi_ChaosConnectDisconnect/control.open_n b/server/site_tests/network_WiFi_ChaosConnectDisconnect/control.open_n
index f72d6ee..5ed6a49 100644
--- a/server/site_tests/network_WiFi_ChaosConnectDisconnect/control.open_n
+++ b/server/site_tests/network_WiFi_ChaosConnectDisconnect/control.open_n
@@ -1,4 +1,4 @@
-# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
+# 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.
@@ -6,6 +6,9 @@
NAME = 'network_WiFi_ChaosConnectDisconnect.open_n'
TIME = 'LONG'
TEST_TYPE = 'server'
+ATTRIBUTES = 'suite:wifi_interop'
+SUITE = 'wifi_interop'
+DEPENDENCIES = 'chaos_nightly, chaos_dut'
DOC = """
This script iterates through all of the access points in the AP compatibility
diff --git a/server/site_tests/network_WiFi_ChaosConnectDisconnect/control.wpa2psk b/server/site_tests/network_WiFi_ChaosConnectDisconnect/control.wpa2psk
index a2c45bf..b9c4c48 100644
--- a/server/site_tests/network_WiFi_ChaosConnectDisconnect/control.wpa2psk
+++ b/server/site_tests/network_WiFi_ChaosConnectDisconnect/control.wpa2psk
@@ -1,4 +1,4 @@
-# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
+# 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.
@@ -6,6 +6,9 @@
NAME = 'network_WiFi_ChaosConnectDisconnect.wpa2psk'
TIME = 'LONG'
TEST_TYPE = 'server'
+ATTRIBUTES = 'suite:wifi_interop'
+SUITE = 'wifi_interop'
+DEPENDENCIES = 'chaos_nightly, chaos_dut'
DOC = """
This script iterates through all of the access points in the AP compatibility
diff --git a/server/site_tests/network_WiFi_ChaosConnectDisconnect/control.wpapsk b/server/site_tests/network_WiFi_ChaosConnectDisconnect/control.wpapsk
index b9f7027..278c8b7 100644
--- a/server/site_tests/network_WiFi_ChaosConnectDisconnect/control.wpapsk
+++ b/server/site_tests/network_WiFi_ChaosConnectDisconnect/control.wpapsk
@@ -1,4 +1,4 @@
-# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
+# 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.
@@ -6,6 +6,9 @@
NAME = 'network_WiFi_ChaosConnectDisconnect.wpapsk'
TIME = 'LONG'
TEST_TYPE = 'server'
+ATTRIBUTES = 'suite:wifi_interop'
+SUITE = 'wifi_interop'
+DEPENDENCIES = 'chaos_nightly, chaos_dut'
DOC = """
This script iterates through all of the access points in the AP compatibility
diff --git a/suite_scheduler.ini b/suite_scheduler.ini
index 471285a..7cb867a 100644
--- a/suite_scheduler.ini
+++ b/suite_scheduler.ini
@@ -419,12 +419,40 @@
branch_specs: ==tot
pool: stress-wifi
-[WiFi_Interop_Nightly]
+[WiFi_Interop_WP2]
run_on: nightly
-hour: 10
+day: 4
suite: wifi_interop
branch_specs: ==tot
-pool:wifichaos
+pool:wifichaos_WP2
+
+[WiFi_Interop_StP2]
+run_on: nightly
+day: 5
+suite: wifi_interop
+branch_specs: ==tot
+pool:wifichaos_StP2
+
+[WiFi_Interop_8797]
+run_on: nightly
+day: 6
+suite: wifi_interop
+branch_specs: ==tot
+pool:wifichaos_8797
+
+[WiFi_Interop_8897]
+run_on: nightly
+day: 0
+suite: wifi_interop
+branch_specs: ==tot
+pool:wifichaos_8897
+
+[WiFi_Interop_4354]
+run_on: nightly
+day: 1
+suite: wifi_interop
+branch_specs: ==tot
+pool:wifichaos_4354
[WiFi_LucidSleep_Nightly]
run_on: nightly
diff --git a/test_suites/control.wifi_interop b/test_suites/control.wifi_interop
index 3111b1e..b56aa06 100644
--- a/test_suites/control.wifi_interop
+++ b/test_suites/control.wifi_interop
@@ -1,4 +1,4 @@
-# Copyright 2015 The Chromium OS Authors. All rights reserved.
+# 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.
@@ -27,11 +27,12 @@
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=120,
- max_runtime_mins=120, devserver_url=devserver_url,
- version_prefix=provision.CROS_VERSION_PREFIX,
- wait_for_results=wait_for_results, job_retry=job_retry,
- max_retries=max_retries)
+ file_bugs=file_bugs, priority=priority, timeout_mins=1440,
+ max_runtime_mins=1440, devserver_url=devserver_url,
+ version_prefix=provision.CROS_VERSION_PREFIX, job_retry=job_retry,
+ max_retries=max_retries, suite_dependencies='chaos_nightly',
+ wait_for_results=wait_for_results)
