dashboard: change the default instance type for GCE builders
This change increases the default resources allocated to builders
running on GCE. Testing has shown a reduction in all.bash build times
for the machines with larger resources. A few unit tests that use the
default sizes have also been updated throughout the repository.
Updates golang/go#17104
Change-Id: I92ba4509bf667da432f011d8f61d2dea7dac5fc4
Reviewed-on: https://go-review.googlesource.com/c/build/+/413420
Reviewed-by: Alex Rakoczy <alex@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
diff --git a/buildlet/ec2_test.go b/buildlet/ec2_test.go
index 21897da..bbc6e36 100644
--- a/buildlet/ec2_test.go
+++ b/buildlet/ec2_test.go
@@ -363,7 +363,7 @@
vmName: "base_vm",
hostType: "host-foo-bar",
opts: &VMOpts{},
- wantInstanceType: "e2-highcpu-2",
+ wantInstanceType: "e2-standard-8",
wantName: "base_vm",
wantBuildletName: "base_vm",
wantBuildletImage: "gcr.io/symbolic-datum-552/gobuilder-arm64-aws",
@@ -390,7 +390,7 @@
},
wantDesc: "test description",
wantImageID: "awesome_image",
- wantInstanceType: "e2-highcpu-2",
+ wantInstanceType: "e2-standard-8",
wantName: "base-vm",
wantZone: "sa-west",
wantBuildletName: "base-vm",
diff --git a/dashboard/builders.go b/dashboard/builders.go
index dd92174..af1a3ef 100644
--- a/dashboard/builders.go
+++ b/dashboard/builders.go
@@ -1384,9 +1384,9 @@
// so their /workdir tmpfs can be larger. The COS
// image has no swap, so we want to make sure the
// /workdir fits completely in memory.
- return "e2-standard-4" // 4 vCPUs, 16 GB mem
+ return "e2-standard-16" // 16 vCPUs, 64 GB mem
}
- return "e2-highcpu-2"
+ return "e2-standard-8" // 8 vCPUs, 32 GB mem
}
// IsEC2 returns true if the machine type is an EC2 arm64 type.
diff --git a/internal/coordinator/pool/ec2_test.go b/internal/coordinator/pool/ec2_test.go
index eb7e943..eb0cb34 100644
--- a/internal/coordinator/pool/ec2_test.go
+++ b/internal/coordinator/pool/ec2_test.go
@@ -31,8 +31,8 @@
// set to default gce type because there is no way to set the machine
// type from outside of the buildenv package.
{
- Type: "e2-standard-4",
- CPU: 4,
+ Type: "e2-standard-16",
+ CPU: 16,
},
})
l.SetCPULimit(20)
@@ -175,9 +175,9 @@
cpuUsed: 0,
entries: make(map[string]*entry),
types: map[string]*cloud.InstanceType{
- "e2-highcpu-2": {
- Type: "e2-highcpu-2",
- CPU: 4,
+ "e2-standard-8": {
+ Type: "e2-standard-8",
+ CPU: 8,
},
},
},
@@ -200,9 +200,9 @@
cpuUsed: 0,
entries: make(map[string]*entry),
types: map[string]*cloud.InstanceType{
- "e2-highcpu-2": {
- Type: "e2-highcpu-2",
- CPU: 4,
+ "e2-standard-8": {
+ Type: "e2-standard-8",
+ CPU: 8,
},
},
},
@@ -225,9 +225,9 @@
cpuUsed: 0,
entries: make(map[string]*entry),
types: map[string]*cloud.InstanceType{
- "e2-highcpu-2": {
- Type: "e2-highcpu-2",
- CPU: 4,
+ "e2-standard-8": {
+ Type: "e2-standard-8",
+ CPU: 8,
},
},
},
@@ -250,9 +250,9 @@
cpuUsed: 0,
entries: make(map[string]*entry),
types: map[string]*cloud.InstanceType{
- "e2-highcpu-2": {
- Type: "e2-highcpu-2",
- CPU: 4,
+ "e2-standard-8": {
+ Type: "e2-standard-8",
+ CPU: 8,
},
},
},
