Add test scheduler for callbox and security tese.

Test: None
Bug: None
Change-Id: I708934f35ddf7628e6f690bbd7a57c61278fe30f
Reviewed-on: https://chromium-review.googlesource.com/517250
Reviewed-by: Jaineel Mehta <jaineelm@google.com>
Reviewed-by: Betty Zhou <bettyzhou@google.com>
Commit-Queue: Betty Zhou <bettyzhou@google.com>
Tested-by: Betty Zhou <bettyzhou@google.com>
Trybot-Ready: Betty Zhou <bettyzhou@google.com>
diff --git a/test_suites/control.android_telephony_nexus_att b/test_suites/control.android_telephony_callbox
similarity index 83%
copy from test_suites/control.android_telephony_nexus_att
copy to test_suites/control.android_telephony_callbox
index 952d440..303d10f 100644
--- a/test_suites/control.android_telephony_nexus_att
+++ b/test_suites/control.android_telephony_callbox
@@ -1,10 +1,10 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
+# Copyright 2017 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 = 'bettyzhou, bmahadev, krisr'
-NAME = 'android_telephony_nexus_att'
-PURPOSE = 'Test Android Nexus Telephony Sanity For AT&T'
+AUTHOR = 'bettyzhou, jaineelm, krisr'
+NAME = 'android_telephony_callbox'
+PURPOSE = 'Test Android Telephony Callbox'
 TIME = 'LONG'
 TEST_TYPE = 'Server'
 
@@ -28,6 +28,7 @@
 from autotest_lib.server.cros.dynamic_suite import dynamic_suite
 
 args_dict['add_experimental'] = True
+args_dict['max_runtime_mins'] = 6000
 args_dict['version_prefix'] = provision.ANDROID_BUILD_VERSION_PREFIX
 args_dict['name'] = NAME
 args_dict['job'] = job
diff --git a/test_suites/control.android_telephony_nexus_att b/test_suites/control.android_telephony_callbox_security
similarity index 82%
copy from test_suites/control.android_telephony_nexus_att
copy to test_suites/control.android_telephony_callbox_security
index 952d440..3cd69fc 100644
--- a/test_suites/control.android_telephony_nexus_att
+++ b/test_suites/control.android_telephony_callbox_security
@@ -1,10 +1,10 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
+# Copyright 2017 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 = 'bettyzhou, bmahadev, krisr'
-NAME = 'android_telephony_nexus_att'
-PURPOSE = 'Test Android Nexus Telephony Sanity For AT&T'
+AUTHOR = 'bettyzhou, jaineelm, krisr'
+NAME = 'android_telephony_callbox_security'
+PURPOSE = 'Test Android Telephony Callbox'
 TIME = 'LONG'
 TEST_TYPE = 'Server'
 
@@ -28,6 +28,7 @@
 from autotest_lib.server.cros.dynamic_suite import dynamic_suite
 
 args_dict['add_experimental'] = True
+args_dict['max_runtime_mins'] = 6000
 args_dict['version_prefix'] = provision.ANDROID_BUILD_VERSION_PREFIX
 args_dict['name'] = NAME
 args_dict['job'] = job
diff --git a/test_suites/control.android_telephony_nexus_att b/test_suites/control.android_telephony_international_roaming_security
similarity index 82%
copy from test_suites/control.android_telephony_nexus_att
copy to test_suites/control.android_telephony_international_roaming_security
index 952d440..a2d164c 100644
--- a/test_suites/control.android_telephony_nexus_att
+++ b/test_suites/control.android_telephony_international_roaming_security
@@ -1,11 +1,11 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
+# Copyright 2017 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 = 'bettyzhou, bmahadev, krisr'
-NAME = 'android_telephony_nexus_att'
-PURPOSE = 'Test Android Nexus Telephony Sanity For AT&T'
-TIME = 'LONG'
+AUTHOR = 'bettyzhou, krisr'
+NAME = 'android_telephony_international_roaming_security'
+PURPOSE = 'Test Android Telephony International Roaming'
+TIME = 'MEDIUM'
 TEST_TYPE = 'Server'
 
 DOC = """
diff --git a/test_suites/control.android_telephony_nexus_att b/test_suites/control.android_telephony_longevity_security
similarity index 85%
rename from test_suites/control.android_telephony_nexus_att
rename to test_suites/control.android_telephony_longevity_security
index 952d440..6014d94 100644
--- a/test_suites/control.android_telephony_nexus_att
+++ b/test_suites/control.android_telephony_longevity_security
@@ -1,10 +1,10 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
+# Copyright 2017 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 = 'bettyzhou, bmahadev, krisr'
-NAME = 'android_telephony_nexus_att'
-PURPOSE = 'Test Android Nexus Telephony Sanity For AT&T'
+NAME = 'android_telephony_longevity_security'
+PURPOSE = 'Test Android Telephony Longevity'
 TIME = 'LONG'
 TEST_TYPE = 'Server'
 
@@ -28,6 +28,7 @@
 from autotest_lib.server.cros.dynamic_suite import dynamic_suite
 
 args_dict['add_experimental'] = True
+args_dict['max_runtime_mins'] = 6000
 args_dict['version_prefix'] = provision.ANDROID_BUILD_VERSION_PREFIX
 args_dict['name'] = NAME
 args_dict['job'] = job
diff --git a/test_suites/control.android_telephony_nexus_att b/test_suites/control.android_telephony_mobility_security
similarity index 84%
copy from test_suites/control.android_telephony_nexus_att
copy to test_suites/control.android_telephony_mobility_security
index 952d440..172a205 100644
--- a/test_suites/control.android_telephony_nexus_att
+++ b/test_suites/control.android_telephony_mobility_security
@@ -1,10 +1,10 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
+# Copyright 2017 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 = 'bettyzhou, bmahadev, krisr'
-NAME = 'android_telephony_nexus_att'
-PURPOSE = 'Test Android Nexus Telephony Sanity For AT&T'
+AUTHOR = 'bettyzhou, jaineelm, krisr'
+NAME = 'android_telephony_mobility_security'
+PURPOSE = 'Android Telephony Mobility Sanity Test'
 TIME = 'LONG'
 TEST_TYPE = 'Server'
 
diff --git a/test_suites/control.android_telephony_nexus_spt b/test_suites/control.android_telephony_nexus_spt
deleted file mode 100644
index 963c8bf..0000000
--- a/test_suites/control.android_telephony_nexus_spt
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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 = 'bettyzhou, bmahadev, krisr'
-NAME = 'android_telephony_nexus_spt'
-PURPOSE = 'Test Android Nexus Telephony Sanity For Sprint'
-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['version_prefix'] = provision.ANDROID_BUILD_VERSION_PREFIX
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.android_telephony_nexus_tmo b/test_suites/control.android_telephony_nexus_tmo
deleted file mode 100644
index f309907..0000000
--- a/test_suites/control.android_telephony_nexus_tmo
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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 = 'bettyzhou, bmahadev, krisr'
-NAME = 'android_telephony_nexus_tmo'
-PURPOSE = 'Test Android Nexus Telephony Sanity For T-Mobile'
-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['version_prefix'] = provision.ANDROID_BUILD_VERSION_PREFIX
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.android_telephony_nexus_vzw b/test_suites/control.android_telephony_nexus_vzw
deleted file mode 100644
index 3e9add8..0000000
--- a/test_suites/control.android_telephony_nexus_vzw
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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 = 'bettyzhou, bmahadev, krisr'
-NAME = 'android_telephony_nexus_vzw'
-PURPOSE = 'Test Android Nexus Telephony Sanity For Verizon'
-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['version_prefix'] = provision.ANDROID_BUILD_VERSION_PREFIX
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.android_telephony_nightly_att b/test_suites/control.android_telephony_nightly_att
deleted file mode 100644
index d143add..0000000
--- a/test_suites/control.android_telephony_nightly_att
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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 = 'bettyzhou, bmahadev, krisr'
-NAME = 'android_telephony_nightly_att'
-PURPOSE = 'Test Android Nightly Telephony Sanity For AT&T'
-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['version_prefix'] = provision.ANDROID_BUILD_VERSION_PREFIX
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.android_telephony_nexus_att b/test_suites/control.android_telephony_nightly_security
similarity index 84%
copy from test_suites/control.android_telephony_nexus_att
copy to test_suites/control.android_telephony_nightly_security
index 952d440..06d3931 100644
--- a/test_suites/control.android_telephony_nexus_att
+++ b/test_suites/control.android_telephony_nightly_security
@@ -1,10 +1,10 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
+# Copyright 2017 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 = 'bettyzhou, bmahadev, krisr'
-NAME = 'android_telephony_nexus_att'
-PURPOSE = 'Test Android Nexus Telephony Sanity For AT&T'
+AUTHOR = 'bettyzhou, jaineelm, krisr'
+NAME = 'android_telephony_nightly_security'
+PURPOSE = 'Android Nightly Telephony Sanity Test'
 TIME = 'LONG'
 TEST_TYPE = 'Server'
 
diff --git a/test_suites/control.android_telephony_nightly_spt b/test_suites/control.android_telephony_nightly_spt
deleted file mode 100644
index 2679dcf..0000000
--- a/test_suites/control.android_telephony_nightly_spt
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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 = 'bettyzhou, bmahadev, krisr'
-NAME = 'android_telephony_nightly_spt'
-PURPOSE = 'Test Android Nightly Telephony Sanity For Sprint'
-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['version_prefix'] = provision.ANDROID_BUILD_VERSION_PREFIX
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.android_telephony_nightly_tmo b/test_suites/control.android_telephony_nightly_tmo
deleted file mode 100644
index 578ba6b..0000000
--- a/test_suites/control.android_telephony_nightly_tmo
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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 = 'bettyzhou, bmahadev, krisr'
-NAME = 'android_telephony_nightly_tmo'
-PURPOSE = 'Test Android Nightly Telephony Sanity For T-Mobile'
-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['version_prefix'] = provision.ANDROID_BUILD_VERSION_PREFIX
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.android_telephony_nightly_vzw b/test_suites/control.android_telephony_nightly_vzw
deleted file mode 100644
index cbfe3ea..0000000
--- a/test_suites/control.android_telephony_nightly_vzw
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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 = 'bettyzhou, bmahadev, krisr'
-NAME = 'android_telephony_nightly_vzw'
-PURPOSE = 'Test Android Nightly Telephony Sanity For Verizon'
-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['version_prefix'] = provision.ANDROID_BUILD_VERSION_PREFIX
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)