deploy: Reboot DUT by cold-reset from servo side
When we do update FW for RO+RW in mostly cases we need reboot the DUT
by cold-reset.
The warm-reset(reboot) is not recommended as reboot after flashing new FW.
BUG=chromium:1157932, chromium:1105952
TEST=re-run install-firmware step on not finished deployment step
./site_utils/deployment/prepare/main.py --results-dir /tr --hostname chromeos6-row14-rack24-host7 --host-info-file /tr/host_info_store/chromeos6-row14-rack24-host7.store install-firmware
Change-Id: I99bd4279badc83e9899d54e57e1e61ca5baf5f90
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2590711
Tested-by: Otabek Kasimov <otabek@google.com>
Reviewed-by: Garry Wang <xianuowang@chromium.org>
Reviewed-by: Gregory Nisbet <gregorynisbet@google.com>
Commit-Queue: Otabek Kasimov <otabek@google.com>
diff --git a/site_utils/deployment/prepare/dut.py b/site_utils/deployment/prepare/dut.py
index d49d9f1..7ee0c3e 100644
--- a/site_utils/deployment/prepare/dut.py
+++ b/site_utils/deployment/prepare/dut.py
@@ -13,6 +13,7 @@
from __future__ import print_function
import contextlib
+import six
import time
import common
@@ -461,10 +462,10 @@
_check_firmware_update_result(host, fw_update_log)
try:
- host.reboot()
+ try_reset_by_servo(host)
except Exception as e:
logging.debug('Failed to reboot the DUT after update firmware; %s', e)
- try_reset_by_servo(host)
+ raise Exception('Failed to reboot the DUT after update firmware')
# Once we confirmed DUT can boot from new firmware, get us out of
# dev-mode and clear GBB flags. GBB flags are non-zero because
