Update callbox test control files.
Test: None
Bug: 38251331
Change-Id: Ia9405c5eed460df5d79822b4ffaabb718f5ff2fc
Reviewed-on: https://chromium-review.googlesource.com/514649
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/server/site_tests/android_ACTS/control.Telephony_TMO_Callbox_Marlin b/server/site_tests/android_ACTS/control.Telephony_Callbox_TMO_Angler
similarity index 87%
copy from server/site_tests/android_ACTS/control.Telephony_TMO_Callbox_Marlin
copy to server/site_tests/android_ACTS/control.Telephony_Callbox_TMO_Angler
index daf7fef..09dd9c0 100644
--- a/server/site_tests/android_ACTS/control.Telephony_TMO_Callbox_Marlin
+++ b/server/site_tests/android_ACTS/control.Telephony_Callbox_TMO_Angler
@@ -3,7 +3,7 @@
# found in the LICENSE file.
AUTHOR = 'bettyzhou, jaineelm, krisr'
-NAME = 'android_ACTS.Telephony_TMO_Callbox_Marlin'
+NAME = 'android_ACTS.Telephony_Callbox_TMO_Angler'
TIME = 'LONG'
TEST_TYPE = 'Server'
ATTRIBUTES = 'suite:android_telephony_callbox'
@@ -16,7 +16,7 @@
def run(machine):
job.run_test('android_ACTS',
testbed=hosts.create_testbed(machine),
- config_file='telephony-callbox-test-station-1.config',
+ config_file='telephony-callbox-tmo-angler.config',
test_file='telephony_tmo_anritsu_callbox',
additional_configs=['simcard_list.json'],
testtracker_project_id=11349,
diff --git a/server/site_tests/android_ACTS/control.Telephony_TMO_Callbox_Marlin b/server/site_tests/android_ACTS/control.Telephony_Callbox_TMO_Bullhead
similarity index 87%
rename from server/site_tests/android_ACTS/control.Telephony_TMO_Callbox_Marlin
rename to server/site_tests/android_ACTS/control.Telephony_Callbox_TMO_Bullhead
index daf7fef..6372c5c 100644
--- a/server/site_tests/android_ACTS/control.Telephony_TMO_Callbox_Marlin
+++ b/server/site_tests/android_ACTS/control.Telephony_Callbox_TMO_Bullhead
@@ -3,7 +3,7 @@
# found in the LICENSE file.
AUTHOR = 'bettyzhou, jaineelm, krisr'
-NAME = 'android_ACTS.Telephony_TMO_Callbox_Marlin'
+NAME = 'android_ACTS.Telephony_Callbox_TMO_Bullhead'
TIME = 'LONG'
TEST_TYPE = 'Server'
ATTRIBUTES = 'suite:android_telephony_callbox'
@@ -16,7 +16,7 @@
def run(machine):
job.run_test('android_ACTS',
testbed=hosts.create_testbed(machine),
- config_file='telephony-callbox-test-station-1.config',
+ config_file='telephony-callbox-tmo-bullhead.config',
test_file='telephony_tmo_anritsu_callbox',
additional_configs=['simcard_list.json'],
testtracker_project_id=11349,
diff --git a/server/site_tests/android_ACTS/control.Telephony_TMO_Callbox_Marlin b/server/site_tests/android_ACTS/control.Telephony_Callbox_TMO_Marlin
similarity index 87%
copy from server/site_tests/android_ACTS/control.Telephony_TMO_Callbox_Marlin
copy to server/site_tests/android_ACTS/control.Telephony_Callbox_TMO_Marlin
index daf7fef..360e3bc 100644
--- a/server/site_tests/android_ACTS/control.Telephony_TMO_Callbox_Marlin
+++ b/server/site_tests/android_ACTS/control.Telephony_Callbox_TMO_Marlin
@@ -3,7 +3,7 @@
# found in the LICENSE file.
AUTHOR = 'bettyzhou, jaineelm, krisr'
-NAME = 'android_ACTS.Telephony_TMO_Callbox_Marlin'
+NAME = 'android_ACTS.Telephony_Callbox_TMO_Marlin'
TIME = 'LONG'
TEST_TYPE = 'Server'
ATTRIBUTES = 'suite:android_telephony_callbox'
@@ -16,7 +16,7 @@
def run(machine):
job.run_test('android_ACTS',
testbed=hosts.create_testbed(machine),
- config_file='telephony-callbox-test-station-1.config',
+ config_file='telephony-callbox-tmo-marlin.config',
test_file='telephony_tmo_anritsu_callbox',
additional_configs=['simcard_list.json'],
testtracker_project_id=11349,
diff --git a/server/site_tests/android_ACTS/control.Telephony_TMO_Callbox_Marlin b/server/site_tests/android_ACTS/control.Telephony_Callbox_TMO_Sailfish
similarity index 87%
copy from server/site_tests/android_ACTS/control.Telephony_TMO_Callbox_Marlin
copy to server/site_tests/android_ACTS/control.Telephony_Callbox_TMO_Sailfish
index daf7fef..1d142a5 100644
--- a/server/site_tests/android_ACTS/control.Telephony_TMO_Callbox_Marlin
+++ b/server/site_tests/android_ACTS/control.Telephony_Callbox_TMO_Sailfish
@@ -3,7 +3,7 @@
# found in the LICENSE file.
AUTHOR = 'bettyzhou, jaineelm, krisr'
-NAME = 'android_ACTS.Telephony_TMO_Callbox_Marlin'
+NAME = 'android_ACTS.Telephony_Callbox_TMO_Sailfish'
TIME = 'LONG'
TEST_TYPE = 'Server'
ATTRIBUTES = 'suite:android_telephony_callbox'
@@ -16,7 +16,7 @@
def run(machine):
job.run_test('android_ACTS',
testbed=hosts.create_testbed(machine),
- config_file='telephony-callbox-test-station-1.config',
+ config_file='telephony-callbox-tmo-sailfish.config',
test_file='telephony_tmo_anritsu_callbox',
additional_configs=['simcard_list.json'],
testtracker_project_id=11349,
diff --git a/server/site_tests/android_ACTS/control.Telephony_VZW_Callbox_Angler b/server/site_tests/android_ACTS/control.Telephony_Callbox_VZW_Angler
similarity index 87%
copy from server/site_tests/android_ACTS/control.Telephony_VZW_Callbox_Angler
copy to server/site_tests/android_ACTS/control.Telephony_Callbox_VZW_Angler
index 35df257..de68707 100644
--- a/server/site_tests/android_ACTS/control.Telephony_VZW_Callbox_Angler
+++ b/server/site_tests/android_ACTS/control.Telephony_Callbox_VZW_Angler
@@ -3,7 +3,7 @@
# found in the LICENSE file.
AUTHOR = 'bettyzhou, jaineelm, krisr'
-NAME = 'android_ACTS.Telephony_VZW_Callbox_Angler'
+NAME = 'android_ACTS.Telephony_Callbox_VZW_Angler'
TIME = 'LONG'
TEST_TYPE = 'Server'
ATTRIBUTES = 'suite:android_telephony_callbox'
@@ -16,7 +16,7 @@
def run(machine):
job.run_test('android_ACTS',
testbed=hosts.create_testbed(machine),
- config_file='telephony-callbox-test-station-6.config',
+ config_file='telephony-callbox-vzw-angler.config',
test_file='telephony_vzw_anritsu_callbox',
additional_configs=['simcard_list.json'],
testtracker_project_id=11349,
diff --git a/server/site_tests/android_ACTS/control.Telephony_VZW_Callbox_Angler b/server/site_tests/android_ACTS/control.Telephony_Callbox_VZW_Bullhead
similarity index 87%
rename from server/site_tests/android_ACTS/control.Telephony_VZW_Callbox_Angler
rename to server/site_tests/android_ACTS/control.Telephony_Callbox_VZW_Bullhead
index 35df257..4910019 100644
--- a/server/site_tests/android_ACTS/control.Telephony_VZW_Callbox_Angler
+++ b/server/site_tests/android_ACTS/control.Telephony_Callbox_VZW_Bullhead
@@ -3,7 +3,7 @@
# found in the LICENSE file.
AUTHOR = 'bettyzhou, jaineelm, krisr'
-NAME = 'android_ACTS.Telephony_VZW_Callbox_Angler'
+NAME = 'android_ACTS.Telephony_Callbox_VZW_Bullhead'
TIME = 'LONG'
TEST_TYPE = 'Server'
ATTRIBUTES = 'suite:android_telephony_callbox'
@@ -16,7 +16,7 @@
def run(machine):
job.run_test('android_ACTS',
testbed=hosts.create_testbed(machine),
- config_file='telephony-callbox-test-station-6.config',
+ config_file='telephony-callbox-vzw-bullhead.config',
test_file='telephony_vzw_anritsu_callbox',
additional_configs=['simcard_list.json'],
testtracker_project_id=11349,
diff --git a/server/site_tests/android_ACTS/control.Telephony_VZW_Callbox_Angler b/server/site_tests/android_ACTS/control.Telephony_Callbox_VZW_Marlin
similarity index 87%
copy from server/site_tests/android_ACTS/control.Telephony_VZW_Callbox_Angler
copy to server/site_tests/android_ACTS/control.Telephony_Callbox_VZW_Marlin
index 35df257..be87d3c 100644
--- a/server/site_tests/android_ACTS/control.Telephony_VZW_Callbox_Angler
+++ b/server/site_tests/android_ACTS/control.Telephony_Callbox_VZW_Marlin
@@ -3,7 +3,7 @@
# found in the LICENSE file.
AUTHOR = 'bettyzhou, jaineelm, krisr'
-NAME = 'android_ACTS.Telephony_VZW_Callbox_Angler'
+NAME = 'android_ACTS.Telephony_Callbox_VZW_Marlin'
TIME = 'LONG'
TEST_TYPE = 'Server'
ATTRIBUTES = 'suite:android_telephony_callbox'
@@ -16,7 +16,7 @@
def run(machine):
job.run_test('android_ACTS',
testbed=hosts.create_testbed(machine),
- config_file='telephony-callbox-test-station-6.config',
+ config_file='telephony-callbox-vzw-marlin.config',
test_file='telephony_vzw_anritsu_callbox',
additional_configs=['simcard_list.json'],
testtracker_project_id=11349,
diff --git a/server/site_tests/android_ACTS/control.Telephony_VZW_Callbox_Angler b/server/site_tests/android_ACTS/control.Telephony_Callbox_VZW_Sailfish
similarity index 87%
copy from server/site_tests/android_ACTS/control.Telephony_VZW_Callbox_Angler
copy to server/site_tests/android_ACTS/control.Telephony_Callbox_VZW_Sailfish
index 35df257..59df9a6 100644
--- a/server/site_tests/android_ACTS/control.Telephony_VZW_Callbox_Angler
+++ b/server/site_tests/android_ACTS/control.Telephony_Callbox_VZW_Sailfish
@@ -3,7 +3,7 @@
# found in the LICENSE file.
AUTHOR = 'bettyzhou, jaineelm, krisr'
-NAME = 'android_ACTS.Telephony_VZW_Callbox_Angler'
+NAME = 'android_ACTS.Telephony_Callbox_VZW_Sailfish'
TIME = 'LONG'
TEST_TYPE = 'Server'
ATTRIBUTES = 'suite:android_telephony_callbox'
@@ -16,7 +16,7 @@
def run(machine):
job.run_test('android_ACTS',
testbed=hosts.create_testbed(machine),
- config_file='telephony-callbox-test-station-6.config',
+ config_file='telephony-callbox-vzw-sailfish.config',
test_file='telephony_vzw_anritsu_callbox',
additional_configs=['simcard_list.json'],
testtracker_project_id=11349,
diff --git a/server/site_tests/android_ACTS/control.Telephony_TMO_Callbox_Angler b/server/site_tests/android_ACTS/control.Telephony_TMO_Callbox_Angler
deleted file mode 100644
index a4d3d08..0000000
--- a/server/site_tests/android_ACTS/control.Telephony_TMO_Callbox_Angler
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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, jaineelm, krisr'
-NAME = 'android_ACTS.Telephony_TMO_Callbox_Angler'
-TIME = 'LONG'
-TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:android_telephony_callbox'
-DEPENDENCIES = 'carrier:callbox'
-
-DOC = """
-This test runs telephony callbox test with T-Mobile test SIM.
-"""
-
-def run(machine):
- job.run_test('android_ACTS',
- testbed=hosts.create_testbed(machine),
- config_file='telephony-callbox-test-station-5.config',
- test_file='telephony_tmo_anritsu_callbox',
- additional_configs=['simcard_list.json'],
- testtracker_project_id=11349,
- testtracker_owner='android-comms-tvc@google.com',
- testtracker_extra_env="tmobile",
- acts_timeout=36000)
-
-parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_TMO_Callbox_Sailfish b/server/site_tests/android_ACTS/control.Telephony_TMO_Callbox_Sailfish
deleted file mode 100644
index cb80280..0000000
--- a/server/site_tests/android_ACTS/control.Telephony_TMO_Callbox_Sailfish
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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, jaineelm, krisr'
-NAME = 'android_ACTS.Telephony_TMO_Callbox_Sailfish'
-TIME = 'LONG'
-TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:android_telephony_callbox'
-DEPENDENCIES = 'carrier:callbox'
-
-DOC = """
-This test runs telephony callbox test with T-Mobile test SIM.
-"""
-
-def run(machine):
- job.run_test('android_ACTS',
- testbed=hosts.create_testbed(machine),
- config_file='telephony-callbox-test-station-3.config',
- test_file='telephony_tmo_anritsu_callbox',
- additional_configs=['simcard_list.json'],
- testtracker_project_id=11349,
- testtracker_owner='android-comms-tvc@google.com',
- testtracker_extra_env="tmobile",
- acts_timeout=36000)
-
-parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_VZW_Callbox_Bullhead b/server/site_tests/android_ACTS/control.Telephony_VZW_Callbox_Bullhead
deleted file mode 100644
index b5cae44..0000000
--- a/server/site_tests/android_ACTS/control.Telephony_VZW_Callbox_Bullhead
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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, jaineelm, krisr'
-NAME = 'android_ACTS.Telephony_VZW_Callbox_Bullhead'
-TIME = 'LONG'
-TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:android_telephony_callbox'
-DEPENDENCIES = 'carrier:callbox'
-
-DOC = """
-This test runs telephony callbox test with Verizon test SIM.
-"""
-
-def run(machine):
- job.run_test('android_ACTS',
- testbed=hosts.create_testbed(machine),
- config_file='telephony-callbox-test-station-7.config',
- test_file='telephony_vzw_anritsu_callbox',
- additional_configs=['simcard_list.json'],
- testtracker_project_id=11349,
- testtracker_owner='android-comms-tvc@google.com',
- testtracker_extra_env="verizon",
- acts_timeout=36000)
-
-parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_VZW_Callbox_Marlin b/server/site_tests/android_ACTS/control.Telephony_VZW_Callbox_Marlin
deleted file mode 100644
index 8b3b7dd..0000000
--- a/server/site_tests/android_ACTS/control.Telephony_VZW_Callbox_Marlin
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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, jaineelm, krisr'
-NAME = 'android_ACTS.Telephony_VZW_Callbox_Marlin'
-TIME = 'LONG'
-TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:android_telephony_callbox'
-DEPENDENCIES = 'carrier:callbox'
-
-DOC = """
-This test runs telephony callbox test with Verizon test SIM.
-"""
-
-def run(machine):
- job.run_test('android_ACTS',
- testbed=hosts.create_testbed(machine),
- config_file='telephony-callbox-test-station-2.config',
- test_file='telephony_vzw_anritsu_callbox',
- additional_configs=['simcard_list.json'],
- testtracker_project_id=11349,
- testtracker_owner='android-comms-tvc@google.com',
- testtracker_extra_env="verizon",
- acts_timeout=36000)
-
-parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_VZW_Callbox_Sailfish b/server/site_tests/android_ACTS/control.Telephony_VZW_Callbox_Sailfish
deleted file mode 100644
index 56d8d77..0000000
--- a/server/site_tests/android_ACTS/control.Telephony_VZW_Callbox_Sailfish
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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, jaineelm, krisr'
-NAME = 'android_ACTS.Telephony_VZW_Callbox_Sailfish'
-TIME = 'LONG'
-TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:android_telephony_callbox'
-DEPENDENCIES = 'carrier:callbox'
-
-DOC = """
-This test runs telephony callbox test with Verizon test SIM.
-"""
-
-def run(machine):
- job.run_test('android_ACTS',
- testbed=hosts.create_testbed(machine),
- config_file='telephony-callbox-test-station-4.config',
- test_file='telephony_vzw_anritsu_callbox',
- additional_configs=['simcard_list.json'],
- testtracker_project_id=11349,
- testtracker_owner='android-comms-tvc@google.com',
- testtracker_extra_env="verizon",
- acts_timeout=36000)
-
-parallel_simple(run, machines)
