dashboard: add host-linux-arm64-aws builder
Add the host-linux-arm64-aws builder. The HostConfig IsVM method has
been modified to support the concept that an EC2 VM can be created
which runs the buildlet binary in a container. This configuration
would have both a VM image and a container image set in the host
configuration.
For golang/go#36841
Change-Id: I092b48b1dda24d24bcd0b10dff0b2126f5f43017
Reviewed-on: https://go-review.googlesource.com/c/build/+/249118
Run-TryBot: Carlos Amedee <carlos@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
diff --git a/dashboard/builders_test.go b/dashboard/builders_test.go
index 7f593f3..8c87c69 100644
--- a/dashboard/builders_test.go
+++ b/dashboard/builders_test.go
@@ -598,7 +598,6 @@
"host-linux-armel-cross": true,
"host-linux-x86-alpine": true, // TODO(golang.org/issue/19938): Fix the Alpine builder, or remove it.
- "host-linux-arm64-aws": true, // TODO(golang.org/issue/36841): Add a builder that uses this host, or remove it.
}
used := make(map[string]bool)
@@ -874,3 +873,55 @@
t.Error("the linux-amd64-longtest builder doesn't set GO_TEST_SHORT=0, is that intentional?")
}
}
+
+func TestHostConfigIsVM(t *testing.T) {
+ testCases := []struct {
+ desc string
+ config *HostConfig
+ want bool
+ }{
+ {
+ desc: "non-ec2-vm",
+ config: &HostConfig{
+ VMImage: "image-x",
+ ContainerImage: "",
+ isEC2: false,
+ },
+ want: true,
+ },
+ {
+ desc: "non-ec2-container",
+ config: &HostConfig{
+ VMImage: "",
+ ContainerImage: "container-image-x",
+ isEC2: false,
+ },
+ want: false,
+ },
+ {
+ desc: "ec2-container",
+ config: &HostConfig{
+ VMImage: "image-x",
+ ContainerImage: "container-image-x",
+ isEC2: true,
+ },
+ want: false,
+ },
+ {
+ desc: "ec2-vm",
+ config: &HostConfig{
+ VMImage: "image-x",
+ ContainerImage: "",
+ isEC2: true,
+ },
+ want: true,
+ },
+ }
+ for _, tc := range testCases {
+ t.Run(fmt.Sprintf(tc.desc), func(t *testing.T) {
+ if got := tc.config.IsVM(); got != tc.want {
+ t.Errorf("HostConfig.IsVM() = %t; want %t", got, tc.want)
+ }
+ })
+ }
+}
