aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra
diff options
context:
space:
mode:
Diffstat (limited to 'infra')
-rw-r--r--infra/bots/gen_tasks.go8
-rw-r--r--infra/bots/tasks.json50
2 files changed, 26 insertions, 32 deletions
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 4e0f278bd0..1c7749eef8 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -40,7 +40,7 @@ const (
DEFAULT_OS_DEBIAN = "Debian-9.1"
DEFAULT_OS_LINUX_GCE = "Debian-9.2"
- DEFAULT_OS_MAC = "Mac-10.13.2"
+ DEFAULT_OS_MAC = "Mac-10.13.3"
DEFAULT_OS_UBUNTU = "Ubuntu-14.04"
DEFAULT_OS_WIN = "Windows-2016Server-14393"
@@ -337,12 +337,6 @@ func defaultSwarmDimensions(parts map[string]string) []string {
glog.Fatalf("Entry %q not found in Mac GPU mapping.", parts["cpu_or_gpu_value"])
}
d["gpu"] = gpu
- // TODO(benjaminwagner): Mac GPU bots haven't been upgraded.
- d["os"] = map[string]string{
- "IntelHD6000": "Mac-10.13.3",
- "IntelHD615": "Mac-10.13.3",
- "IntelIris5100": "Mac-10.13.1",
- }[parts["cpu_or_gpu_value"]]
// Yuck. We have two different types of MacMini7,1 with the same GPU but different CPUs.
if parts["cpu_or_gpu_value"] == "IntelIris5100" {
// Run all tasks on Golo machines for now.
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 0594b68188..d31232b801 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -4988,7 +4988,7 @@
"dimensions": [
"cpu:x86-64-E5-2697_v2",
"gpu:none",
- "os:Mac-10.13.2",
+ "os:Mac-10.13.3",
"pool:Skia"
],
"extra_args": [
@@ -5011,7 +5011,7 @@
"dimensions": [
"cpu:x86-64-E5-2697_v2",
"gpu:none",
- "os:Mac-10.13.2",
+ "os:Mac-10.13.3",
"pool:Skia"
],
"extra_args": [
@@ -5041,7 +5041,7 @@
"dimensions": [
"cpu:x86-64-E5-2697_v2",
"gpu:none",
- "os:Mac-10.13.2",
+ "os:Mac-10.13.3",
"pool:Skia"
],
"extra_args": [
@@ -5064,7 +5064,7 @@
"dimensions": [
"cpu:x86-64-E5-2697_v2",
"gpu:none",
- "os:Mac-10.13.2",
+ "os:Mac-10.13.3",
"pool:Skia"
],
"extra_args": [
@@ -5087,7 +5087,7 @@
"dimensions": [
"cpu:x86-64-E5-2697_v2",
"gpu:none",
- "os:Mac-10.13.2",
+ "os:Mac-10.13.3",
"pool:Skia"
],
"extra_args": [
@@ -5110,7 +5110,7 @@
"dimensions": [
"cpu:x86-64-E5-2697_v2",
"gpu:none",
- "os:Mac-10.13.2",
+ "os:Mac-10.13.3",
"pool:Skia"
],
"extra_args": [
@@ -5133,7 +5133,7 @@
"dimensions": [
"cpu:x86-64-E5-2697_v2",
"gpu:none",
- "os:Mac-10.13.2",
+ "os:Mac-10.13.3",
"pool:Skia"
],
"extra_args": [
@@ -5156,7 +5156,7 @@
"dimensions": [
"cpu:x86-64-E5-2697_v2",
"gpu:none",
- "os:Mac-10.13.2",
+ "os:Mac-10.13.3",
"pool:Skia"
],
"extra_args": [
@@ -5179,7 +5179,7 @@
"dimensions": [
"cpu:x86-64-E5-2697_v2",
"gpu:none",
- "os:Mac-10.13.2",
+ "os:Mac-10.13.3",
"pool:Skia"
],
"extra_args": [
@@ -5202,7 +5202,7 @@
"dimensions": [
"cpu:x86-64-E5-2697_v2",
"gpu:none",
- "os:Mac-10.13.2",
+ "os:Mac-10.13.3",
"pool:Skia"
],
"extra_args": [
@@ -5225,7 +5225,7 @@
"dimensions": [
"cpu:x86-64-E5-2697_v2",
"gpu:none",
- "os:Mac-10.13.2",
+ "os:Mac-10.13.3",
"pool:Skia"
],
"extra_args": [
@@ -5248,7 +5248,7 @@
"dimensions": [
"cpu:x86-64-E5-2697_v2",
"gpu:none",
- "os:Mac-10.13.2",
+ "os:Mac-10.13.3",
"pool:Skia"
],
"extra_args": [
@@ -9856,7 +9856,7 @@
],
"dimensions": [
"cpu:x86-64-E5-2697_v2",
- "os:Mac-10.13.2",
+ "os:Mac-10.13.3",
"pool:Skia"
],
"execution_timeout_ns": 14400000000000,
@@ -9903,7 +9903,7 @@
],
"dimensions": [
"cpu:x86-64-E5-2697_v2",
- "os:Mac-10.13.2",
+ "os:Mac-10.13.3",
"pool:Skia"
],
"execution_timeout_ns": 14400000000000,
@@ -9951,7 +9951,7 @@
"dimensions": [
"cpu:x86-64-i7-4578U",
"gpu:8086:0a2e",
- "os:Mac-10.13.1",
+ "os:Mac-10.13.3",
"pool:Skia"
],
"execution_timeout_ns": 14400000000000,
@@ -9999,7 +9999,7 @@
"dimensions": [
"cpu:x86-64-i7-4578U",
"gpu:8086:0a2e",
- "os:Mac-10.13.1",
+ "os:Mac-10.13.3",
"pool:Skia"
],
"execution_timeout_ns": 14400000000000,
@@ -10047,7 +10047,7 @@
"dimensions": [
"cpu:x86-64-i7-4578U",
"gpu:8086:0a2e",
- "os:Mac-10.13.1",
+ "os:Mac-10.13.3",
"pool:Skia"
],
"execution_timeout_ns": 14400000000000,
@@ -19521,7 +19521,7 @@
],
"dimensions": [
"cpu:x86-64-E5-2697_v2",
- "os:Mac-10.13.2",
+ "os:Mac-10.13.3",
"pool:Skia"
],
"execution_timeout_ns": 14400000000000,
@@ -19569,7 +19569,7 @@
],
"dimensions": [
"cpu:x86-64-E5-2697_v2",
- "os:Mac-10.13.2",
+ "os:Mac-10.13.3",
"pool:Skia"
],
"execution_timeout_ns": 14400000000000,
@@ -19617,7 +19617,7 @@
],
"dimensions": [
"cpu:x86-64-E5-2697_v2",
- "os:Mac-10.13.2",
+ "os:Mac-10.13.3",
"pool:Skia"
],
"execution_timeout_ns": 14400000000000,
@@ -19665,7 +19665,7 @@
],
"dimensions": [
"cpu:x86-64-E5-2697_v2",
- "os:Mac-10.13.2",
+ "os:Mac-10.13.3",
"pool:Skia"
],
"execution_timeout_ns": 14400000000000,
@@ -19714,7 +19714,7 @@
"dimensions": [
"cpu:x86-64-i7-4578U",
"gpu:8086:0a2e",
- "os:Mac-10.13.1",
+ "os:Mac-10.13.3",
"pool:Skia"
],
"execution_timeout_ns": 14400000000000,
@@ -19763,7 +19763,7 @@
"dimensions": [
"cpu:x86-64-i7-4578U",
"gpu:8086:0a2e",
- "os:Mac-10.13.1",
+ "os:Mac-10.13.3",
"pool:Skia"
],
"execution_timeout_ns": 14400000000000,
@@ -19812,7 +19812,7 @@
"dimensions": [
"cpu:x86-64-i7-4578U",
"gpu:8086:0a2e",
- "os:Mac-10.13.1",
+ "os:Mac-10.13.3",
"pool:Skia"
],
"execution_timeout_ns": 14400000000000,
@@ -19861,7 +19861,7 @@
"dimensions": [
"cpu:x86-64-i7-4578U",
"gpu:8086:0a2e",
- "os:Mac-10.13.1",
+ "os:Mac-10.13.3",
"pool:Skia"
],
"execution_timeout_ns": 14400000000000,
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-04 21:43:26 +0000