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

move FM mac bots again

Browse Source 
I swear yesterday we had ~10 unused 10.14 bots...

Anyway, as with the last move, I don't really care where these bots are
running, so long as they have enough machines to schedule reaonably
quickly.  This switches their spec to the default "Mac", which is
currently 19 VMs running 10.15.7 on trashcan Mac Pros.

Similarly, Win2019 -> Win.  This is a change in bot name only, just to
capture the "I'll take whatever's default" spirit.  I'd use Linux or
Debian too if there were one.

Change-Id: Ifa7615735c660018a5f3f46f4d8035e0b5bf8141
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365518
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Reviewed-by: Weston Tracey <westont@google.com>
This commit is contained in:
Mike Klein 2021-02-03 09:29:05 -06:00
parent 507c5659d7
commit 0131c3241f
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
infra/bots/jobs.json
View File

@ -152,8 +152,8 @@
"FM-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN",
"FM-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-MSAN",
"FM-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN",
"FM-Mac10.14-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All",
"FM-Win2019-Clang-GCE-CPU-AVX2-x86_64-Debug-All",
"FM-Mac-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All",
"FM-Win-Clang-GCE-CPU-AVX2-x86_64-Debug-All",
"Fuzz-Debian10-Clang",
"Housekeeper-Nightly-RecreateSKPs_DryRun",
"Housekeeper-Nightly-UpdateGoDeps",

19
infra/bots/tasks.json
View File

@ -773,14 +773,14 @@
"FM-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN"
]
},
"FM-Mac10.14-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All": {
"FM-Mac-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All": {
"tasks": [
"FM-Mac10.14-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All"
"FM-Mac-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All"
]
},
"FM-Win2019-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
"FM-Win-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
"tasks": [
"FM-Win2019-Clang-GCE-CPU-AVX2-x86_64-Debug-All"
"FM-Win-Clang-GCE-CPU-AVX2-x86_64-Debug-All"
]
},
"Fuzz-Debian10-Clang": {
@ -15140,7 +15140,7 @@
"max_attempts": 1,
"service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
},
"FM-Mac10.14-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All": {
"FM-Mac-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All": {
"cipd_packages": [
{
"name": "skia/bots/skimage",
@ -15170,7 +15170,7 @@
"--task_id",
"<(TASK_ID)",
"--bot",
"FM-Mac10.14-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All",
"FM-Mac-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All",
"build/fm${EXECUTABLE_SUFFIX}"
],
"dependencies": [
@ -15178,8 +15178,9 @@
"Housekeeper-PerCommit-BuildTaskDrivers_darwin_amd64"
],
"dimensions": [
"cpu:x86-64-E5-2697_v2",
"gpu:none",
"os:Mac-10.14.6",
"os:Mac-10.15.7",
"pool:Skia"
],
"expiration_ns": 900000000000,
@ -15187,7 +15188,7 @@
"max_attempts": 1,
"service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
},
"FM-Win2019-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
"FM-Win-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
"cipd_packages": [
{
"name": "skia/bots/skimage",
@ -15217,7 +15218,7 @@
"--task_id",
"<(TASK_ID)",
"--bot",
"FM-Win2019-Clang-GCE-CPU-AVX2-x86_64-Debug-All",
"FM-Win-Clang-GCE-CPU-AVX2-x86_64-Debug-All",
"build/fm${EXECUTABLE_SUFFIX}"
],
"dependencies": [