m/test/localregistry: use osbase/oci/registry
This replaces the localregistry implementation with a small wrapper
around the new registry package.
The images attribute of the Bazel rule was changed from a list to a
dict, which makes the repository and tag independent from the file path.
Change-Id: I1f6213dd67f7bdcf2373fe136958caa68b9f4d10
Reviewed-on: https://review.monogon.dev/c/monogon/+/4089
Reviewed-by: Tim Windelschmidt <tim@monogon.tech>
Tested-by: Jenkins CI
diff --git a/metropolis/test/launch/BUILD.bazel b/metropolis/test/launch/BUILD.bazel
index 166ba3a..492fdd4 100644
--- a/metropolis/test/launch/BUILD.bazel
+++ b/metropolis/test/launch/BUILD.bazel
@@ -49,8 +49,8 @@
"//metropolis/node/core/rpc/resolver",
"//metropolis/proto/api",
"//metropolis/proto/common",
- "//metropolis/test/localregistry",
"//osbase/logbuffer",
+ "//osbase/oci/registry",
"//osbase/test/qemu",
"@com_github_cenkalti_backoff_v4//:backoff",
"@com_github_kballard_go_shellquote//:go-shellquote",
diff --git a/metropolis/test/launch/cluster.go b/metropolis/test/launch/cluster.go
index d8eb8cd..5ad4121 100644
--- a/metropolis/test/launch/cluster.go
+++ b/metropolis/test/launch/cluster.go
@@ -51,7 +51,7 @@
"source.monogon.dev/metropolis/node"
"source.monogon.dev/metropolis/node/core/rpc"
"source.monogon.dev/metropolis/node/core/rpc/resolver"
- "source.monogon.dev/metropolis/test/localregistry"
+ "source.monogon.dev/osbase/oci/registry"
"source.monogon.dev/osbase/test/qemu"
)
@@ -583,7 +583,7 @@
// Optional local registry which will be made available to the cluster to
// pull images from. This is a more efficient alternative to preseeding all
// images used for testing.
- LocalRegistry *localregistry.Server
+ LocalRegistry *registry.Server
// InitialClusterConfiguration will be passed to the first node when creating the
// cluster, and defines some basic properties of the cluster. If not specified,