env/linux-arm64/aws, dashboard: update linux-arm64 builder image
This updates the instruction for creating a VM image and
a buildlet container image. The instructions will provide
a better description for the steps required to create the images.
The VM image has been updated to no longer require sudo when
the docker command is executed.
The host configuration has been updated with a new VM type and
VM image.
The rundockerbuildlet service configuration has been modified:
* The memory limit has been removed because rundockerbuildlet will
now use all of the available memory for buildlets running on AWS.
* The service will report as running even after rundockerbuildlet has
exited. Rundockerbuildlet will initiate a single buildlet and then exit.
* The service will not be restarted after rundockerbuildlet has exited.
Changes made to rundockerbuildlet which required these changes have been
made in CL 234114.
Updates golang/go#36841
Change-Id: I3ff51e414b11a2b1427cbd7c6e24e9135fc2a5c3
Reviewed-on: https://go-review.googlesource.com/c/build/+/236297
Run-TryBot: Carlos Amedee <carlos@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Alexander Rakoczy <alex@golang.org>
diff --git a/dashboard/builders.go b/dashboard/builders.go
index cc922f7..4470c9c 100644
--- a/dashboard/builders.go
+++ b/dashboard/builders.go
@@ -545,8 +545,9 @@
},
"host-linux-arm64-aws": &HostConfig{
Notes: "Debian Buster, EC2 arm64 instance. See x/build/env/linux-arm64/aws",
- VMImage: "ami-0454a5239a73a9e81",
- machineType: "a1.xlarge",
+ VMImage: "ami-06f66c749c71b2511",
+ ContainerImage: "gobuilder-arm64-aws:latest",
+ machineType: "m6g.xlarge",
isEC2: true,
env: []string{"GOROOT_BOOTSTRAP=/usr/local/go-bootstrap"},
buildletURLTmpl: "http://storage.googleapis.com/$BUCKET/buildlet.linux-amd64",
@@ -661,7 +662,7 @@
panic(fmt.Sprintf("HostType %q != key %q", c.HostType, key))
}
nSet := 0
- if c.VMImage != "" {
+ if c.VMImage != "" && !c.isEC2 {
nSet++
}
if c.ContainerImage != "" {
@@ -1328,7 +1329,7 @@
case c.IsReverse:
return "Reverse (dedicated machine/VM)"
case c.IsEC2():
- return "EC2 VM"
+ return "EC2 VM Container"
case c.IsVM():
return "GCE VM"
case c.IsContainer():
@@ -1351,6 +1352,9 @@
if c.NestedVirt {
return "debian-stretch-vmx"
}
+ if c.isEC2 && c.ContainerImage != "" {
+ return fmt.Sprintf("gcr.io/%s/%s", buildenv.Production.ProjectName, c.ContainerImage)
+ }
return ""
}
