Move network_WiFi_UpdateRouter to its own suite
This will make wifi_matfunc more consistent. This is going to
be done in two parts because the preflight check scripts
are unhappy with doing all of this at once.
TEST=None
BUG=chromium:492948
Change-Id: I9bd54d3eaee693d495ae92d3d63bfa7c31d06e4d
Reviewed-on: https://chromium-review.googlesource.com/273681
Trybot-Ready: Kris Rambish <krisr@chromium.org>
Tested-by: Kris Rambish <krisr@chromium.org>
Reviewed-by: Tien Chang <tienchang@chromium.org>
Commit-Queue: Kris Rambish <krisr@chromium.org>
diff --git a/server/site_tests/network_WiFi_UpdateRouter/control b/server/site_tests/network_WiFi_UpdateRouter/control
index 8e53e00..d8d3f64 100644
--- a/server/site_tests/network_WiFi_UpdateRouter/control
+++ b/server/site_tests/network_WiFi_UpdateRouter/control
@@ -1,4 +1,4 @@
-# Copyright (c) 2014 The Chromium OS Authors. All rights reserved.
+# Copyright 2015 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -7,9 +7,9 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
DEPENDENCIES = 'wificell'
-ATTRIBUTES = "suite:wifi_matfunc, suite:wifi_matfunc_bcm4356, suite:wifi_matfunc_intel7265, suite:wifi_matfunc_marvell8897"
-SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_matfunc_intel7265')
+# TODO: Re-activate when the suite exists
+# ATTRIBUTES = 'suite:wifi_update_router'
+# SUITE = 'wifi_update_router'
DOC = """
This test updates the router in a WiFi cell to the latest stable version.
diff --git a/suite_scheduler.ini b/suite_scheduler.ini
index a3687ee..0cf12b1 100644
--- a/suite_scheduler.ini
+++ b/suite_scheduler.ini
@@ -336,6 +336,18 @@
branch_specs: ==tot
pool: groamer
+[WiFi_Update_Router]
+run_on: nightly
+suite: wifi_update_router
+branch_specs: ==tot
+pool: wificell
+
+[WiFi_Update_Router_Preflight]
+run_on: nightly
+suite: wifi_update_router
+branch_specs: ==tot
+pool: wificell_preflight
+
[WiMAX]
run_on: nightly
suite: wimax
diff --git a/test_suites/control.wifi_update_router b/test_suites/control.wifi_update_router
new file mode 100644
index 0000000..275ac32
--- /dev/null
+++ b/test_suites/control.wifi_update_router
@@ -0,0 +1,40 @@
+# Copyright 2015 The Chromium 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 = "krisr@chromium.org"
+NAME = "wifi_update_router"
+PURPOSE = "Update the wificell routers."
+CRITERIA = "Update all wificell and wificell_preflight cells."
+
+TIME = "SHORT"
+TEST_CATEGORY = "General"
+TEST_CLASS = "suite"
+TEST_TYPE = "Server"
+
+DOC = """
+This is an example of a dynamic test suite.
+
+@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)