Add subtestbed param for callbox test control files.
Test: None
Bug: 63636629
Change-Id: I2ffd1ee6bbe3f508cd8b07c9d452ce81ff3f8194
Reviewed-on: https://chromium-review.googlesource.com/570845
Reviewed-by: Kris Rambish <krisr@chromium.org>
Reviewed-by: Jaineel Mehta <jaineelm@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_Callbox_TMO b/server/site_tests/android_ACTS/control.Telephony_Callbox_TMO
deleted file mode 100644
index 22d6ba0..0000000
--- a/server/site_tests/android_ACTS/control.Telephony_Callbox_TMO
+++ /dev/null
@@ -1,28 +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_Callbox_TMO'
-TIME = 'LONG'
-TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:android_telephony_callbox'
-DEPENDENCIES = 'carrier:callbox-tmo'
-
-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-tmo.config',
- test_file='telephony_tmo_anritsu_callbox',
- additional_configs=['simcard_list.json'],
- testtracker_project_id=11349,
- override_build_url='git_master-release/sailfish-userdebug/latest',
- 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_Callbox_TMO_Angler b/server/site_tests/android_ACTS/control.Telephony_Callbox_TMO_Angler
index d872e7e..a38e081 100644
--- a/server/site_tests/android_ACTS/control.Telephony_Callbox_TMO_Angler
+++ b/server/site_tests/android_ACTS/control.Telephony_Callbox_TMO_Angler
@@ -20,6 +20,7 @@
test_file='telephony_tmo_anritsu_callbox',
additional_configs=['simcard_list.json'],
testtracker_project_id=11349,
+ valid_job_urls_only=True,
override_build_url='git_master-release/sailfish-userdebug/latest',
testtracker_owner='android-comms-tvc@google.com',
testtracker_extra_env="tmobile",
diff --git a/server/site_tests/android_ACTS/control.Telephony_Callbox_TMO_Bullhead b/server/site_tests/android_ACTS/control.Telephony_Callbox_TMO_Bullhead
index 458d1e7..2119f5f 100644
--- a/server/site_tests/android_ACTS/control.Telephony_Callbox_TMO_Bullhead
+++ b/server/site_tests/android_ACTS/control.Telephony_Callbox_TMO_Bullhead
@@ -20,6 +20,7 @@
test_file='telephony_tmo_anritsu_callbox',
additional_configs=['simcard_list.json'],
testtracker_project_id=11349,
+ valid_job_urls_only=True,
override_build_url='git_master-release/sailfish-userdebug/latest',
testtracker_owner='android-comms-tvc@google.com',
testtracker_extra_env="tmobile",
diff --git a/server/site_tests/android_ACTS/control.Telephony_Callbox_TMO_Marlin b/server/site_tests/android_ACTS/control.Telephony_Callbox_TMO_Marlin
index 886d8d5..eb68fb1 100644
--- a/server/site_tests/android_ACTS/control.Telephony_Callbox_TMO_Marlin
+++ b/server/site_tests/android_ACTS/control.Telephony_Callbox_TMO_Marlin
@@ -20,6 +20,7 @@
test_file='telephony_tmo_anritsu_callbox',
additional_configs=['simcard_list.json'],
testtracker_project_id=11349,
+ valid_job_urls_only=True,
override_build_url='git_master-release/sailfish-userdebug/latest',
testtracker_owner='android-comms-tvc@google.com',
testtracker_extra_env="tmobile",
diff --git a/server/site_tests/android_ACTS/control.Telephony_Callbox_TMO_Sailfish b/server/site_tests/android_ACTS/control.Telephony_Callbox_TMO_Sailfish
index 108ab14..9f43a50 100644
--- a/server/site_tests/android_ACTS/control.Telephony_Callbox_TMO_Sailfish
+++ b/server/site_tests/android_ACTS/control.Telephony_Callbox_TMO_Sailfish
@@ -20,6 +20,7 @@
test_file='telephony_tmo_anritsu_callbox',
additional_configs=['simcard_list.json'],
testtracker_project_id=11349,
+ valid_job_urls_only=True,
override_build_url='git_master-release/sailfish-userdebug/latest',
testtracker_owner='android-comms-tvc@google.com',
testtracker_extra_env="tmobile",
diff --git a/server/site_tests/android_ACTS/control.Telephony_Callbox_VZW b/server/site_tests/android_ACTS/control.Telephony_Callbox_VZW
deleted file mode 100644
index 1a1ffae..0000000
--- a/server/site_tests/android_ACTS/control.Telephony_Callbox_VZW
+++ /dev/null
@@ -1,28 +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_Callbox_VZW'
-TIME = 'LONG'
-TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:android_telephony_callbox'
-DEPENDENCIES = 'carrier:callbox-vzw'
-
-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-vzw.config',
- test_file='telephony_vzw_anritsu_callbox',
- additional_configs=['simcard_list.json'],
- testtracker_project_id=11349,
- override_build_url='git_master-release/sailfish-userdebug/latest',
- 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_Callbox_VZW_Angler b/server/site_tests/android_ACTS/control.Telephony_Callbox_VZW_Angler
index 7c94bee..dd5e59c 100644
--- a/server/site_tests/android_ACTS/control.Telephony_Callbox_VZW_Angler
+++ b/server/site_tests/android_ACTS/control.Telephony_Callbox_VZW_Angler
@@ -20,6 +20,7 @@
test_file='telephony_vzw_anritsu_callbox',
additional_configs=['simcard_list.json'],
testtracker_project_id=11349,
+ valid_job_urls_only=True,
override_build_url='git_master-release/sailfish-userdebug/latest',
testtracker_owner='android-comms-tvc@google.com',
testtracker_extra_env="verizon",
diff --git a/server/site_tests/android_ACTS/control.Telephony_Callbox_VZW_Bullhead b/server/site_tests/android_ACTS/control.Telephony_Callbox_VZW_Bullhead
index eaea906..8adb02d 100644
--- a/server/site_tests/android_ACTS/control.Telephony_Callbox_VZW_Bullhead
+++ b/server/site_tests/android_ACTS/control.Telephony_Callbox_VZW_Bullhead
@@ -20,6 +20,7 @@
test_file='telephony_vzw_anritsu_callbox',
additional_configs=['simcard_list.json'],
testtracker_project_id=11349,
+ valid_job_urls_only=True,
override_build_url='git_master-release/sailfish-userdebug/latest',
testtracker_owner='android-comms-tvc@google.com',
testtracker_extra_env="verizon",
diff --git a/server/site_tests/android_ACTS/control.Telephony_Callbox_VZW_Marlin b/server/site_tests/android_ACTS/control.Telephony_Callbox_VZW_Marlin
index d85b9eb..a33bf83 100644
--- a/server/site_tests/android_ACTS/control.Telephony_Callbox_VZW_Marlin
+++ b/server/site_tests/android_ACTS/control.Telephony_Callbox_VZW_Marlin
@@ -20,6 +20,7 @@
test_file='telephony_vzw_anritsu_callbox',
additional_configs=['simcard_list.json'],
testtracker_project_id=11349,
+ valid_job_urls_only=True,
override_build_url='git_master-release/sailfish-userdebug/latest',
testtracker_owner='android-comms-tvc@google.com',
testtracker_extra_env="verizon",
diff --git a/server/site_tests/android_ACTS/control.Telephony_Callbox_VZW_Sailfish b/server/site_tests/android_ACTS/control.Telephony_Callbox_VZW_Sailfish
index 91c85ce..63845fb 100644
--- a/server/site_tests/android_ACTS/control.Telephony_Callbox_VZW_Sailfish
+++ b/server/site_tests/android_ACTS/control.Telephony_Callbox_VZW_Sailfish
@@ -20,6 +20,7 @@
test_file='telephony_vzw_anritsu_callbox',
additional_configs=['simcard_list.json'],
testtracker_project_id=11349,
+ valid_job_urls_only=True,
override_build_url='git_master-release/sailfish-userdebug/latest',
testtracker_owner='android-comms-tvc@google.com',
testtracker_extra_env="verizon",
