treewide: introduce osbase package and move things around
All except localregistry moved from metropolis/pkg to osbase,
localregistry moved to metropolis/test as its only used there anyway.
Change-Id: If1a4bf377364bef0ac23169e1b90379c71b06d72
Reviewed-on: https://review.monogon.dev/c/monogon/+/3079
Tested-by: Jenkins CI
Reviewed-by: Serge Bazanski <serge@monogon.tech>
diff --git a/metropolis/test/e2e/suites/ha/run_test.go b/metropolis/test/e2e/suites/ha/run_test.go
index 63a2acd..cc02df4 100644
--- a/metropolis/test/e2e/suites/ha/run_test.go
+++ b/metropolis/test/e2e/suites/ha/run_test.go
@@ -9,10 +9,10 @@
"github.com/bazelbuild/rules_go/go/runfiles"
- "source.monogon.dev/metropolis/pkg/localregistry"
- "source.monogon.dev/metropolis/test/launch"
- "source.monogon.dev/metropolis/test/launch/cluster"
+ mlaunch "source.monogon.dev/metropolis/test/launch"
+ "source.monogon.dev/metropolis/test/localregistry"
"source.monogon.dev/metropolis/test/util"
+ "source.monogon.dev/osbase/test/launch"
)
const (
@@ -48,12 +48,12 @@
t.Fatalf("Creating test image registry failed: %v", err)
}
// Launch cluster.
- clusterOptions := cluster.ClusterOptions{
+ clusterOptions := mlaunch.ClusterOptions{
NumNodes: 3,
LocalRegistry: lr,
NodeLogsToFiles: true,
}
- cluster, err := cluster.LaunchCluster(ctx, clusterOptions)
+ cluster, err := mlaunch.LaunchCluster(ctx, clusterOptions)
if err != nil {
t.Fatalf("LaunchCluster failed: %v", err)
}