Revert "Revert "[autotest] Disable testbed in test push before testbed is restored""
This reverts commit c239c0a22120c7a50177bb3243ec3e8267290b4f.
Reason for revert: testbed is broken in testing push again
Original change's description:
> Revert "[autotest] Disable testbed in test push before testbed is restored"
>
> This reverts commit ff92802456f39d7b939b841318021d65e38f3ff6.
>
> Change-Id: I49541bc19b2504e8bb3b3fd4619c1324722968f3
> Reviewed-on: https://chromium-review.googlesource.com/447855
> Tested-by: Dan Shi <dshi@google.com>
> Trybot-Ready: Dan Shi <dshi@google.com>
> Reviewed-by: Shuqian Zhao <shuqianz@chromium.org>
> Commit-Queue: Dan Shi <dshi@google.com>
>
TBR=dshi@google.com,akeshet@chromium.org,shuqianz@chromium.org
# Not skipping CQ checks because original CL landed > 1 day ago.
Change-Id: I8befb2454eb660a1f3289f2cd74fad94436d3ff6
Reviewed-on: https://chromium-review.googlesource.com/453801
Tested-by: Shuqian Zhao <shuqianz@chromium.org>
Trybot-Ready: Shuqian Zhao <shuqianz@chromium.org>
Reviewed-by: Dan Shi <dshi@google.com>
diff --git a/site_utils/test_push.py b/site_utils/test_push.py
index 7f5cceb..9cbb23e 100755
--- a/site_utils/test_push.py
+++ b/site_utils/test_push.py
@@ -612,16 +612,8 @@
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() or testbed_suite.is_alive()):
+ asynchronous_suite.is_alive()):
check_queue(queue)
time.sleep(5)
@@ -630,7 +622,6 @@
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)