treewide: clean up test static binary targets
This removes some intermediate targets only used for transitions by
consolidating them into a single one.
Change-Id: I46dcbcb731038edd2b67259de1811018f5ba43da
Reviewed-on: https://review.monogon.dev/c/monogon/+/3753
Reviewed-by: Leopold Schabel <leo@monogon.tech>
Tested-by: Jenkins CI
Vouch-Run-CI: Tim Windelschmidt <tim@monogon.tech>
diff --git a/metropolis/test/e2e/httpserver/BUILD.bazel b/metropolis/test/e2e/httpserver/BUILD.bazel
index 5d60598..9370eeb 100644
--- a/metropolis/test/e2e/httpserver/BUILD.bazel
+++ b/metropolis/test/e2e/httpserver/BUILD.bazel
@@ -1,5 +1,6 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
-load("@aspect_bazel_lib//lib:transitions.bzl", "platform_transition_binary")
+load("@rules_oci//oci:defs.bzl", "oci_image")
+load("//build/static_binary_tarball:def.bzl", "static_binary_tarball")
go_library(
name = "httpserver_lib",
@@ -15,27 +16,16 @@
visibility = ["//visibility:private"],
)
-platform_transition_binary(
- name = "httpserver_transitioned",
- binary = ":httpserver",
- target_platform = "//build/platforms:linux_amd64_static",
- visibility = ["//visibility:private"],
-)
-
-load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
-
-pkg_tar(
+static_binary_tarball(
name = "httpserver_layer",
- srcs = [":httpserver_transitioned"],
+ executable = ":httpserver",
visibility = ["//visibility:private"],
)
-load("@rules_oci//oci:defs.bzl", "oci_image")
-
oci_image(
name = "httpserver_image",
base = "@distroless_base",
- entrypoint = ["/httpserver"],
+ entrypoint = ["/app/metropolis/test/e2e/httpserver/httpserver_/httpserver"],
tars = [":httpserver_layer"],
visibility = ["//metropolis/test/e2e:__pkg__"],
workdir = "/app",
diff --git a/metropolis/test/e2e/persistentvolume/BUILD.bazel b/metropolis/test/e2e/persistentvolume/BUILD.bazel
index e98f630..cf0917e 100644
--- a/metropolis/test/e2e/persistentvolume/BUILD.bazel
+++ b/metropolis/test/e2e/persistentvolume/BUILD.bazel
@@ -1,4 +1,6 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
+load("@rules_oci//oci:defs.bzl", "oci_image")
+load("//build/static_binary_tarball:def.bzl", "static_binary_tarball")
go_library(
name = "persistentvolume_lib",
@@ -18,29 +20,16 @@
visibility = ["//visibility:private"],
)
-load("@aspect_bazel_lib//lib:transitions.bzl", "platform_transition_binary")
-
-platform_transition_binary(
- name = "persistentvolume_transitioned",
- binary = ":persistentvolume",
- target_platform = "//build/platforms:linux_amd64_static",
- visibility = ["//visibility:private"],
-)
-
-load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
-
-pkg_tar(
+static_binary_tarball(
name = "persistentvolume_layer",
- srcs = [":persistentvolume_transitioned"],
+ executable = ":persistentvolume",
visibility = ["//visibility:private"],
)
-load("@rules_oci//oci:defs.bzl", "oci_image")
-
oci_image(
name = "persistentvolume_image",
base = "@distroless_base",
- entrypoint = ["/persistentvolume"],
+ entrypoint = ["/app/metropolis/test/e2e/persistentvolume/persistentvolume_/persistentvolume"],
tars = [":persistentvolume_layer"],
visibility = ["//metropolis/test/e2e:__pkg__"],
workdir = "/app",
diff --git a/metropolis/test/e2e/preseedtest/BUILD.bazel b/metropolis/test/e2e/preseedtest/BUILD.bazel
index fe9fda9..68f5717 100644
--- a/metropolis/test/e2e/preseedtest/BUILD.bazel
+++ b/metropolis/test/e2e/preseedtest/BUILD.bazel
@@ -1,4 +1,6 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
+load("@rules_oci//oci:defs.bzl", "oci_image", "oci_load")
+load("//build/static_binary_tarball:def.bzl", "static_binary_tarball")
go_library(
name = "preseedtest_lib",
@@ -14,29 +16,16 @@
visibility = ["//visibility:private"],
)
-load("@aspect_bazel_lib//lib:transitions.bzl", "platform_transition_binary")
-
-platform_transition_binary(
- name = "preseedtest_transitioned",
- binary = ":preseedtest",
- target_platform = "//build/platforms:linux_amd64_static",
- visibility = ["//visibility:private"],
-)
-
-load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
-
-pkg_tar(
+static_binary_tarball(
name = "preseedtest_layer",
- srcs = [":preseedtest_transitioned"],
+ executable = ":preseedtest",
visibility = ["//visibility:private"],
)
-load("@rules_oci//oci:defs.bzl", "oci_image", "oci_load")
-
oci_image(
name = "preseedtest_image",
base = "@distroless_base",
- entrypoint = ["/preseedtest"],
+ entrypoint = ["/app/metropolis/test/e2e/preseedtest/preseedtest_/preseedtest"],
tars = [":preseedtest_layer"],
visibility = ["//visibility:private"],
workdir = "/app",
diff --git a/metropolis/test/e2e/selftest/BUILD.bazel b/metropolis/test/e2e/selftest/BUILD.bazel
index 0990150..23445a0 100644
--- a/metropolis/test/e2e/selftest/BUILD.bazel
+++ b/metropolis/test/e2e/selftest/BUILD.bazel
@@ -1,4 +1,6 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
+load("@rules_oci//oci:defs.bzl", "oci_image")
+load("//build/static_binary_tarball:def.bzl", "static_binary_tarball")
go_library(
name = "selftest_lib",
@@ -14,29 +16,16 @@
visibility = ["//visibility:private"],
)
-load("@aspect_bazel_lib//lib:transitions.bzl", "platform_transition_binary")
-
-platform_transition_binary(
- name = "selftest_transitioned",
- binary = ":selftest",
- target_platform = "//build/platforms:linux_amd64_static",
- visibility = ["//visibility:private"],
-)
-
-load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
-
-pkg_tar(
+static_binary_tarball(
name = "selftest_layer",
- srcs = [":selftest_transitioned"],
+ executable = ":selftest",
visibility = ["//visibility:private"],
)
-load("@rules_oci//oci:defs.bzl", "oci_image")
-
oci_image(
name = "selftest_image",
base = "@distroless_base",
- entrypoint = ["/selftest"],
+ entrypoint = ["/app/metropolis/test/e2e/selftest/selftest_/selftest"],
tars = [":selftest_layer"],
visibility = ["//metropolis/test/e2e:__pkg__"],
workdir = "/app",
diff --git a/metropolis/test/e2e/suites/ha_cold/BUILD.bazel b/metropolis/test/e2e/suites/ha_cold/BUILD.bazel
index d3370d0..a70ee55 100644
--- a/metropolis/test/e2e/suites/ha_cold/BUILD.bazel
+++ b/metropolis/test/e2e/suites/ha_cold/BUILD.bazel
@@ -3,11 +3,6 @@
go_test(
name = "ha_cold_test",
srcs = ["run_test.go"],
- data = [
- "//metropolis/node:image",
- "//metropolis/test/e2e:testimages_manifest",
- "//third_party/edk2:firmware",
- ],
tags = [
"resources:iops:5000",
"resources:cpu:3",