Revert "[system-tests] use verbose flag with amberctl"
This reverts commit 0adc4f7d23890b8ee52ea39e7ac2f00f71cac86f.
Reason for revert: -verbose flag isn't known in baselines.
Original change's description:
> [system-tests] use verbose flag with amberctl
>
> In fxrev.dev/376097, we modified amberctl to have a -verbose flag. If we
> actually used this flag in the system tests, it would cause the ota
> tests to fail (since part of the ota tests involves using a downgraded
> build, which does NOT have support for the -verbose flag). Therefore, we
> should actually only use -verbose once we are sure the downgraded build will
> know about the -verbose flag (aka once fxrev.dev/376097 rolls).
>
> Bug: 48754
> Change-Id: I8ea2d6abf234396f2d44817516f1b810dbc5d075
> Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/376757
> Commit-Queue: Zach Kirschenbaum <zkbaum@google.com>
> Reviewed-by: Erick Tryzelaar <etryzelaar@google.com>
> Reviewed-by: Kevin Wells <kevinwells@google.com>
> Testability-Review: Kevin Wells <kevinwells@google.com>
TBR=etryzelaar@google.com,kevinwells@google.com,zkbaum@google.com
Change-Id: I02918e5e041ccb5e071614eef5d076e03928c599
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 48754
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/376933
Reviewed-by: Nathan Mulcahey <nmulcahey@google.com>
Commit-Queue: Nathan Mulcahey <nmulcahey@google.com>
diff --git a/src/sys/pkg/testing/host-target-testing/device/device.go b/src/sys/pkg/testing/host-target-testing/device/device.go
index b748f06..e8fb2af 100644
--- a/src/sys/pkg/testing/host-target-testing/device/device.go
+++ b/src/sys/pkg/testing/host-target-testing/device/device.go
@@ -434,9 +434,9 @@
log.Printf("registering package repository: %s", repo.Dir)
var cmd string
if createRewriteRule {
- cmd = fmt.Sprintf("amberctl add_src -f %s -h %s -verbose", repo.URL, repo.Hash)
+ cmd = fmt.Sprintf("amberctl add_src -f %s -h %s", repo.URL, repo.Hash)
} else {
- cmd = fmt.Sprintf("amberctl add_repo_cfg -f %s -h %s -verbose", repo.URL, repo.Hash)
+ cmd = fmt.Sprintf("amberctl add_repo_cfg -f %s -h %s", repo.URL, repo.Hash)
}
return c.Run(ctx, cmd, os.Stdout, os.Stderr)
}
