commit b05218e6f10ad2d64d2eba0dbda4582f1165ac58
author Otabek Kasimov <otabek@google.com> Thu Dec 31 05:53:24 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 31 05:53:24 2020 +0000
tree 2dfa9100c3921c850c268b32fbf79b9301b1bbd2
parent cfbec913081d559bf3d2c4b1ef6f394e0eef5cb3
parent f3c3482592b1a937cf6aec4e37b78b827ec6b3ff

deploy: Try reboot and then cold-reset after install image on the DUT am: 759ab56438 am: bd8fee96af am: b2da9b9bfe am: f3c3482592

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2345d5f59a4b886853534b3a98f641227ff4cb29

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.")