autotest: Disable testbed testing in test_push.
BUG=chromium:767302
TEST=None
Change-Id: Id9f5f9a2161ad0312e65b2246698c34d70ff3a27
Reviewed-on: https://chromium-review.googlesource.com/677409
Commit-Queue: Xixuan Wu <xixuan@chromium.org>
Tested-by: Xixuan Wu <xixuan@chromium.org>
Reviewed-by: Shuqian Zhao <shuqianz@chromium.org>
diff --git a/site_utils/test_push.py b/site_utils/test_push.py
index 3e0312f..f356cc0 100755
--- a/site_utils/test_push.py
+++ b/site_utils/test_push.py
@@ -73,7 +73,9 @@
IMAGE_BUCKET = CONFIG.get_config_value('CROS', 'image_storage_server')
DEFAULT_EMAIL = CONFIG.get_config_value(
'SCHEDULER', 'notify_email', type=list, default=[])
-DEFAULT_NUM_DUTS = "{'gandof': 4, 'quawks': 2, 'testbed': 1}"
+# TODO(crbug.com/767302): Bump up tesbed requirement back to 1 when we
+# re-enable testbed tests.
+DEFAULT_NUM_DUTS = "{'gandof': 4, 'quawks': 2, 'testbed': 0}"
SUITE_JOB_START_INFO_REGEX = ('^.*Created suite job:.*'
'tab_id=view_job&object_id=(\d+)$')
@@ -620,16 +622,16 @@
asynchronous_suite.start()
# Test suite for testbed
- testbed_suite = multiprocessing.Process(
- target=test_suite_wrapper,
- args=(queue, TESTBED_SUITE, EXPECTED_TEST_RESULTS_TESTBED,
- arguments, False, False, True))
- testbed_suite.daemon = use_daemon
- testbed_suite.start()
+ #testbed_suite = multiprocessing.Process(
+ # target=test_suite_wrapper,
+ # args=(queue, TESTBED_SUITE, EXPECTED_TEST_RESULTS_TESTBED,
+ # arguments, False, False, True))
+ #testbed_suite.daemon = use_daemon
+ #testbed_suite.start()
while (push_to_prod_suite.is_alive()
- or asynchronous_suite.is_alive()
- or testbed_suite.is_alive()):
+ or asynchronous_suite.is_alive()):
+ #or testbed_suite.is_alive()):
check_queue(queue)
time.sleep(5)
@@ -637,7 +639,7 @@
push_to_prod_suite.join()
asynchronous_suite.join()
- testbed_suite.join()
+ #testbed_suite.join()
# All tests pass, push prod-next branch for UPDATED_REPOS.
push_prod_next_branch(updated_repo_heads)