diff options
| -rw-r--r-- | infra/bots/gen_tasks.go | 7 | ||||
| -rw-r--r-- | infra/bots/tasks.json | 30 |
2 files changed, 21 insertions, 16 deletions
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index a937323681..64c7209894 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -489,6 +489,10 @@ func defaultSwarmDimensions(parts map[string]string) []string { if !ok { glog.Fatalf("Entry %q not found in GCE machine type mapping.", parts["role"]) } + // Coverage gets slower with more cores. + if strings.Contains(parts["extra_config"], "Coverage") { + machineType = MACHINE_TYPE_SMALL + } d["machine_type"] = machineType } } else { @@ -1035,7 +1039,8 @@ func coverage(b *specs.TasksCfgBuilder, name string, parts map[string]string, co extraProps := map[string]string{ "gs_bucket": CONFIG.GsBucketCoverage, } - uploadTask := kitchenTask(uploadName, "upload_coverage_results", "swarm_recipe.isolate", SERVICE_ACCOUNT_UPLOAD_COVERAGE, linuxGceDimensions(MACHINE_TYPE_SMALL), extraProps, OUTPUT_NONE) + // Use MACHINE_TYPE_LARGE because this does a bunch of computation before upload. + uploadTask := kitchenTask(uploadName, "upload_coverage_results", "swarm_recipe.isolate", SERVICE_ACCOUNT_UPLOAD_COVERAGE, linuxGceDimensions(MACHINE_TYPE_LARGE), extraProps, OUTPUT_NONE) usesGit(uploadTask, uploadName) uploadTask.CipdPackages = append(uploadTask.CipdPackages, CIPD_PKGS_GSUTIL...) // We need clang_linux to get access to the llvm-profdata and llvm-cov binaries diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index 705a7449db..a396cdc418 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -48864,7 +48864,7 @@ ], "dimensions": [ "cpu:x86-64-Haswell_GCE", - "machine_type:n1-highcpu-64", + "machine_type:n1-highmem-2", "os:Debian-9.4", "pool:Skia" ], @@ -48977,7 +48977,7 @@ ], "dimensions": [ "cpu:x86-64-Haswell_GCE", - "machine_type:n1-highcpu-64", + "machine_type:n1-highmem-2", "os:Debian-9.4", "pool:Skia" ], @@ -49090,7 +49090,7 @@ ], "dimensions": [ "cpu:x86-64-Haswell_GCE", - "machine_type:n1-highcpu-64", + "machine_type:n1-highmem-2", "os:Debian-9.4", "pool:Skia" ], @@ -49203,7 +49203,7 @@ ], "dimensions": [ "cpu:x86-64-Haswell_GCE", - "machine_type:n1-highcpu-64", + "machine_type:n1-highmem-2", "os:Debian-9.4", "pool:Skia" ], @@ -49316,7 +49316,7 @@ ], "dimensions": [ "cpu:x86-64-Haswell_GCE", - "machine_type:n1-highcpu-64", + "machine_type:n1-highmem-2", "os:Debian-9.4", "pool:Skia" ], @@ -49429,7 +49429,7 @@ ], "dimensions": [ "cpu:x86-64-Haswell_GCE", - "machine_type:n1-highcpu-64", + "machine_type:n1-highmem-2", "os:Debian-9.4", "pool:Skia" ], @@ -49542,7 +49542,7 @@ ], "dimensions": [ "cpu:x86-64-Haswell_GCE", - "machine_type:n1-highcpu-64", + "machine_type:n1-highmem-2", "os:Debian-9.4", "pool:Skia" ], @@ -49655,7 +49655,7 @@ ], "dimensions": [ "cpu:x86-64-Haswell_GCE", - "machine_type:n1-highcpu-64", + "machine_type:n1-highmem-2", "os:Debian-9.4", "pool:Skia" ], @@ -49768,7 +49768,7 @@ ], "dimensions": [ "cpu:x86-64-Haswell_GCE", - "machine_type:n1-highcpu-64", + "machine_type:n1-highmem-2", "os:Debian-9.4", "pool:Skia" ], @@ -49881,7 +49881,7 @@ ], "dimensions": [ "cpu:x86-64-Haswell_GCE", - "machine_type:n1-highcpu-64", + "machine_type:n1-highmem-2", "os:Debian-9.4", "pool:Skia" ], @@ -49994,7 +49994,7 @@ ], "dimensions": [ "cpu:x86-64-Haswell_GCE", - "machine_type:n1-highcpu-64", + "machine_type:n1-highmem-2", "os:Debian-9.4", "pool:Skia" ], @@ -50107,7 +50107,7 @@ ], "dimensions": [ "cpu:x86-64-Haswell_GCE", - "machine_type:n1-highcpu-64", + "machine_type:n1-highmem-2", "os:Debian-9.4", "pool:Skia" ], @@ -87551,7 +87551,7 @@ "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", - "machine_type:n1-highmem-2", + "machine_type:n1-highcpu-64", "os:Debian-9.4", "pool:Skia" ], @@ -91499,7 +91499,7 @@ "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", - "machine_type:n1-highmem-2", + "machine_type:n1-highcpu-64", "os:Debian-9.4", "pool:Skia" ], @@ -92152,7 +92152,7 @@ "dimensions": [ "cpu:x86-64-Haswell_GCE", "gpu:none", - "machine_type:n1-highmem-2", + "machine_type:n1-highcpu-64", "os:Debian-9.4", "pool:Skia" ], |