Revert "[botanist] Fastboot continue back to fuchsia"
This reverts commit a5e101a4ee355ae0b050763d6f7fc33045ab6c88.
Reason for revert: did not work and introduces a new failure mode as `fastboot continue` hangs.
Original change's description:
> [botanist] Fastboot continue back to fuchsia
>
> If fastboot is set, continue back to fuchsia after booting.
>
> Change-Id: I29f686672705359d82b9aba487edfd93fecdfc3d
TBR=phosek@google.com,raggi@google.com,joshuaseaton@google.com,nmulcahey@google.com
Change-Id: I322cf596299a0a976cf0bb7a9ce9c5362bd943e6
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
diff --git a/cmd/botanist/run.go b/cmd/botanist/run.go
index e6db6ee..d262036 100644
--- a/cmd/botanist/run.go
+++ b/cmd/botanist/run.go
@@ -18,7 +18,6 @@
"time"
"fuchsia.googlesource.com/tools/botanist"
- "fuchsia.googlesource.com/tools/fastboot"
"fuchsia.googlesource.com/tools/netboot"
"fuchsia.googlesource.com/tools/pdu"
"fuchsia.googlesource.com/tools/retry"
@@ -136,16 +135,6 @@
return err
}
- // TODO(IN-892): Necessary to continue back to fuchsia after rebooting.
- if r.fastboot != "" {
- ctx, cancel := context.WithTimeout(ctx, 2*time.Minute)
- defer cancel()
- f := fastboot.Fastboot{r.fastboot}
- if _, err := f.Continue(ctx); err != nil {
- return err
- }
- }
-
// Run command.
// The subcommand is put in its own process group so that no subprocesses it spins up
// are orphaned on cancelation.
diff --git a/cmd/botanist/zedboot.go b/cmd/botanist/zedboot.go
index b24f244..f6588fd 100644
--- a/cmd/botanist/zedboot.go
+++ b/cmd/botanist/zedboot.go
@@ -24,7 +24,6 @@
"time"
"fuchsia.googlesource.com/tools/botanist"
- "fuchsia.googlesource.com/tools/fastboot"
"fuchsia.googlesource.com/tools/netboot"
"fuchsia.googlesource.com/tools/pdu"
"fuchsia.googlesource.com/tools/retry"
@@ -259,16 +258,6 @@
return err
}
- // TODO(IN-892): Necessary to continue back to fuchsia after rebooting.
- if cmd.fastboot != "" {
- ctx, cancel := context.WithTimeout(ctx, 2*time.Minute)
- defer cancel()
- f := fastboot.Fastboot{cmd.fastboot}
- if _, err := f.Continue(ctx); err != nil {
- return err
- }
- }
-
// Handle host commands
// TODO(IN-831): Remove when host-target-interaction infra is ready
if cmd.hostCmd != "" {
