From e6fba0a50b47d12690969a47ef0ef13178ffc8b8 Mon Sep 17 00:00:00 2001 From: Erik Rose Date: Wed, 16 Feb 2022 15:00:57 -0500 Subject: [PATCH] [infra] Stop overspecifying the version of 10.14. There are no more 10.14.3 bots in the farm and haven't been for some time. This made all 10.14 tasks fail to run. All we have now is 10.14.6, so we can remove the first if clause. The second talks about an OS key that isn't even in the hash anymore, so it can go away too. Change-Id: I53cd54c9520b8a10f72de8e413f023027cdf8088 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/509728 Reviewed-by: Ben Wagner Commit-Queue: Erik Rose --- infra/bots/gen_tasks_logic/gen_tasks_logic.go | 10 +--------- infra/bots/tasks.json | 4 ++-- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/infra/bots/gen_tasks_logic/gen_tasks_logic.go b/infra/bots/gen_tasks_logic/gen_tasks_logic.go index e6353b990f..ef2d80caa8 100644 --- a/infra/bots/gen_tasks_logic/gen_tasks_logic.go +++ b/infra/bots/gen_tasks_logic/gen_tasks_logic.go @@ -759,7 +759,7 @@ func (b *taskBuilder) defaultSwarmDimensions() { "Mac": DEFAULT_OS_MAC, "Mac10.12": "Mac-10.12", "Mac10.13": "Mac-10.13.6", - "Mac10.14": "Mac-10.14.3", + "Mac10.14": "Mac-10.14", "Mac10.15.1": "Mac-10.15.1", "Mac10.15.7": "Mac-10.15.7", // Same as 'Mac', but explicit. "Mac11": "Mac-11.4", @@ -779,14 +779,6 @@ func (b *taskBuilder) defaultSwarmDimensions() { // ChOps-owned machines have Windows 10 21h1. d["os"] = "Windows-10-19043" } - if os == "Mac10.14" && b.parts["model"] == "VMware7.1" { - // ChOps VMs are at a newer version of MacOS. - d["os"] = "Mac-10.14.6" - } - if os == "Mac10.15" && b.parts["model"] == "VMware7.1" { - // ChOps VMs are at a newer version of MacOS. - d["os"] = "Mac-10.15.7" - } if b.parts["model"] == "iPhone11" { d["os"] = "iOS-13.6" } diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index 5eb8d1d32a..8a91f25219 100755 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -49180,7 +49180,7 @@ ], "dimensions": [ "cpu:x86-64-i5-4278U", - "os:Mac-10.14.3", + "os:Mac-10.14", "pool:Skia" ], "environment": { @@ -49290,7 +49290,7 @@ ], "dimensions": [ "cpu:x86-64", - "os:Mac-10.14.6", + "os:Mac-10.14", "pool:Skia" ], "environment": {