diff options
| author | Gregory Nisbet <gregorynisbet@google.com> | 2020-09-23 15:55:04 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-09-29 21:41:24 +0000 |
| commit | bb6cc7c3281c8e3e946df93a20b1049fa409b3e3 (patch) | |
| tree | 102de842ab20a802794f264227fbf01c9f7bbb8b /server/control_segments | |
| parent | 824978f3f32124018bcb04ae7536965a5e8f56d0 (diff) | |
| download | autotest-bb6cc7c3281c8e3e946df93a20b1049fa409b3e3.tar.gz | |
use reboot_ec cold by default
BUG=b/169461036
TEST=ran REBOOT_CMD on DUT, confirmed that it rebooted, ran repair on lab DUT locally.
Change-Id: I70f9ab44f9997261c0e44a29a56c8002f489622b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2427054
Reviewed-by: Garry Wang <xianuowang@chromium.org>
Reviewed-by: Otabek Kasimov <otabek@google.com>
Tested-by: Gregory Nisbet <gregorynisbet@google.com>
Commit-Queue: Gregory Nisbet <gregorynisbet@google.com>
Diffstat (limited to 'server/control_segments')
| -rw-r--r-- | server/control_segments/reset | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/server/control_segments/reset b/server/control_segments/reset index e54550f16d..985f2ad43f 100644 --- a/server/control_segments/reset +++ b/server/control_segments/reset @@ -17,6 +17,15 @@ job_labels = locals().get('job_labels') or ','.join(args) labels_list = [l.strip() for l in job_labels.split(',') if l] +# try to reboot using ectool. If ectool fails, fall back to reboot and +# reboot -f. +REBOOT_CMD = ''' +sync& sleep 5; +ectool reboot_ec cold; +reboot& sleep 10; +reboot -f +''' + def reset(machine): print('Starting to reset host %s' % machine) try: @@ -26,7 +35,7 @@ def reset(machine): with metrics.SecondsTimer(DURATION_METRIC, fields={'dut_host_name': hostname}): # Assume cleanup always runs first. - target.cleanup() + target.cleanup(reboot_cmd=REBOOT_CMD) provision.Cleanup.run_task_actions(job, target, labels_list) target.verify() |