Merge branch 'master' into ipt-udp-matchers

1 files changed, 68 insertions, 0 deletions

diff --git a/tools/images/BUILD b/tools/images/BUILD
new file mode 100644
index 000000000..2b77c2737
--- /dev/null
+++ b/tools/images/BUILD
@@ -0,0 +1,68 @@
+load("@rules_cc//cc:defs.bzl", "cc_binary")
+load("//tools/images:defs.bzl", "vm_image", "vm_test")
+
+package(
+    default_visibility = ["//:sandbox"],
+    licenses = ["notice"],
+)
+
+genrule(
+    name = "zone",
+    outs = ["zone.txt"],
+    cmd = "gcloud config get-value compute/zone > $@",
+    tags = [
+        "local",
+        "manual",
+    ],
+)
+
+sh_binary(
+    name = "builder",
+    srcs = ["build.sh"],
+)
+
+sh_binary(
+    name = "executer",
+    srcs = ["execute.sh"],
+)
+
+cc_binary(
+    name = "test",
+    testonly = 1,
+    srcs = ["test.cc"],
+    linkstatic = 1,
+    deps = [
+        "//test/util:test_main",
+        "@com_google_googletest//:gtest",
+    ],
+)
+
+vm_image(
+    name = "ubuntu1604",
+    family = "ubuntu-1604-lts",
+    project = "ubuntu-os-cloud",
+    scripts = [
+        "//tools/images/ubuntu1604",
+    ],
+)
+
+vm_test(
+    name = "ubuntu1604_test",
+    image = ":ubuntu1604",
+    targets = [":test"],
+)
+
+vm_image(
+    name = "ubuntu1804",
+    family = "ubuntu-1804-lts",
+    project = "ubuntu-os-cloud",
+    scripts = [
+        "//tools/images/ubuntu1804",
+    ],
+)
+
+vm_test(
+    name = "ubuntu1804_test",
+    image = ":ubuntu1804",
+    targets = [":test"],
+)