Revert "deploy: Reboot DUT by cold-reset from servo side"
This reverts commit 58d76767c5b34c9adbf23721e50f16b4869eb262.
Reason for revert: Possible wrong idea, rollback for re-testing
Original change's description:
> 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>
Bug: chromium:1157932
Bug: chromium:1105952
Change-Id: Ie14c8dd133f4c189a22770f1af35945b32e6b368
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2598178
Reviewed-by: Evan Green <evgreen@chromium.org>
Reviewed-by: Gregory Nisbet <gregorynisbet@google.com>
Reviewed-by: Gregory Nisbet <gregorynisbet@chromium.org>
Tested-by: Otabek Kasimov <otabek@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 7ee0c3e..d49d9f1 100644
--- a/site_utils/deployment/prepare/dut.py
+++ b/site_utils/deployment/prepare/dut.py
@@ -13,7 +13,6 @@
from __future__ import print_function
import contextlib
-import six
import time
import common
@@ -462,10 +461,10 @@
_check_firmware_update_result(host, fw_update_log)
try:
- try_reset_by_servo(host)
+ host.reboot()
except Exception as e:
logging.debug('Failed to reboot the DUT after update firmware; %s', e)
- raise Exception('Failed to reboot the DUT after update firmware')
+ try_reset_by_servo(host)
# 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
