commit 759ab56438d5ff66cd1d488ddf1c4bb95a65a616
author Otabek Kasimov <otabek@google.com> Wed Dec 23 03:24:33 2020 -0800
committer Commit Bot <commit-bot@chromium.org> Thu Dec 31 04:14:08 2020 +0000
tree b04bf331a505dcbcf899e8717edb32554cee8c9b
parent 84fe67bc466c884002cd0a609cc552665f19b1ec

deploy: Try reboot and then cold-reset after install image on the DUT

BUG=b:175825566
TEST=run local

Change-Id: I699d86ad03ce4f3699bf1445c0aa8575b7220bb2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2601908
Reviewed-by: Garry Wang <xianuowang@chromium.org>
Reviewed-by: Gregory Nisbet <gregorynisbet@google.com>
Commit-Queue: Otabek Kasimov <otabek@google.com>
Tested-by: Otabek Kasimov <otabek@google.com>

site_utils/deployment/prepare/dut.py

diff --git a/site_utils/deployment/prepare/dut.py b/site_utils/deployment/prepare/dut.py
index d49d9f1..6b80285 100644
--- a/site_utils/deployment/prepare/dut.py
+++ b/site_utils/deployment/prepare/dut.py
@@ -408,7 +408,11 @@
     host.run('chromeos-install --yes', timeout=host.INSTALL_TIMEOUT)
 
     logging.info("Rebooting DUT to boot from hard drive.")
-    power_cycle_via_servo(host)
+    try:
+        host.reboot()
+    except Exception as e:
+        logging.info('Failed to reboot DUT via ssh; %s', str(e))
+        try_reset_by_servo(host)
     logging.info("Install test image completed successfully.")