AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[infra] Stop overspecifying the version of 10.14.

Browse Source 
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 <bungeman@google.com>
Commit-Queue: Erik Rose <erikrose@google.com>
This commit is contained in:
Erik Rose 2022-02-16 15:00:57 -05:00 committed by SkCQ
parent f436cf2343
commit e6fba0a50b
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
infra/bots/gen_tasks_logic/gen_tasks_logic.go
View File

@ -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"
}

4
infra/bots/tasks.json
View File

@ -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": {