Revert "Revert "Revert "[autotest] Disable testbed in test push before testbed is restored"""
This reverts commit c7c60d33ef6da7237a4f7638c9e07f18db5423c2.
Change-Id: Ifac92f9c24763d99bd0b19b457d023700c47a3fd
Reviewed-on: https://chromium-review.googlesource.com/456592
Reviewed-by: Dan Shi <dshi@google.com>
Commit-Queue: Dan Shi <dshi@google.com>
Tested-by: Dan Shi <dshi@google.com>
diff --git a/site_utils/test_push.py b/site_utils/test_push.py
index 454a291..e7246d1 100755
--- a/site_utils/test_push.py
+++ b/site_utils/test_push.py
@@ -612,8 +612,16 @@
asynchronous_suite.daemon = True
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()
+
while (push_to_prod_suite.is_alive() or au_suite.is_alive() or
- asynchronous_suite.is_alive()):
+ asynchronous_suite.is_alive() or testbed_suite.is_alive()):
check_queue(queue)
time.sleep(5)
@@ -622,6 +630,7 @@
push_to_prod_suite.join()
au_suite.join()
asynchronous_suite.join()
+ testbed_suite.join()
# All tests pass, push prod-next branch for UPDATED_REPOS.
push_prod_next_branch(updated_repo_heads)