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

[infra] Change the iOS arch to arm64 so we get the right CIPD packages for the rpi2 machines.

Browse Source 
Change-Id: Id44d46f57aa27b2c7e5abc9949444b244c4b7ee7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/477645
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Erik Rose <erikrose@google.com>
This commit is contained in:
Erik Rose 2021-11-29 19:26:28 -05:00 committed by SkCQ
parent 0ed19771c3
commit 4fb7dec706
2 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
infra/bots/gen_tasks_logic/task_builder.go
View File

@ -283,7 +283,7 @@ func (b *taskBuilder) cipdPlatform() string {
} else if b.matchOs("Android", "ChromeOS") {
return cipd.PlatformLinuxArm64
} else if b.matchOs("iOS") {
return cipd.PlatformLinuxArmv6l
return cipd.PlatformLinuxArm64
} else {
return cipd.PlatformLinuxAmd64
}

120
infra/bots/tasks.json
View File

@ -32387,12 +32387,12 @@
"casSpec": "perf",
"cipd_packages": [
{
"name": "infra/3pp/tools/cpython/linux-armv6l",
"name": "infra/3pp/tools/cpython/linux-arm64",
"path": "cipd_bin_packages/cpython",
"version": "version:2@2.7.18.chromium.39"
},
{
"name": "infra/3pp/tools/cpython3/linux-armv6l",
"name": "infra/3pp/tools/cpython3/linux-arm64",
"path": "cipd_bin_packages/cpython3",
"version": "version:2@3.8.10.chromium.19"
},
@ -32480,12 +32480,12 @@
"casSpec": "perf",
"cipd_packages": [
{
"name": "infra/3pp/tools/cpython/linux-armv6l",
"name": "infra/3pp/tools/cpython/linux-arm64",
"path": "cipd_bin_packages/cpython",
"version": "version:2@2.7.18.chromium.39"
},
{
"name": "infra/3pp/tools/cpython3/linux-armv6l",
"name": "infra/3pp/tools/cpython3/linux-arm64",
"path": "cipd_bin_packages/cpython3",
"version": "version:2@3.8.10.chromium.19"
},
@ -32573,12 +32573,12 @@
"casSpec": "perf",
"cipd_packages": [
{
"name": "infra/3pp/tools/cpython/linux-armv6l",
"name": "infra/3pp/tools/cpython/linux-arm64",
"path": "cipd_bin_packages/cpython",
"version": "version:2@2.7.18.chromium.39"
},
{
"name": "infra/3pp/tools/cpython3/linux-armv6l",
"name": "infra/3pp/tools/cpython3/linux-arm64",
"path": "cipd_bin_packages/cpython3",
"version": "version:2@3.8.10.chromium.19"
},
@ -32666,12 +32666,12 @@
"casSpec": "perf",
"cipd_packages": [
{
"name": "infra/3pp/tools/cpython/linux-armv6l",
"name": "infra/3pp/tools/cpython/linux-arm64",
"path": "cipd_bin_packages/cpython",
"version": "version:2@2.7.18.chromium.39"
},
{
"name": "infra/3pp/tools/cpython3/linux-armv6l",
"name": "infra/3pp/tools/cpython3/linux-arm64",
"path": "cipd_bin_packages/cpython3",
"version": "version:2@3.8.10.chromium.19"
},
@ -32759,12 +32759,12 @@
"casSpec": "perf",
"cipd_packages": [
{
"name": "infra/3pp/tools/cpython/linux-armv6l",
"name": "infra/3pp/tools/cpython/linux-arm64",
"path": "cipd_bin_packages/cpython",
"version": "version:2@2.7.18.chromium.39"
},
{
"name": "infra/3pp/tools/cpython3/linux-armv6l",
"name": "infra/3pp/tools/cpython3/linux-arm64",
"path": "cipd_bin_packages/cpython3",
"version": "version:2@3.8.10.chromium.19"
},
@ -32852,12 +32852,12 @@
"casSpec": "perf",
"cipd_packages": [
{
"name": "infra/3pp/tools/cpython/linux-armv6l",
"name": "infra/3pp/tools/cpython/linux-arm64",
"path": "cipd_bin_packages/cpython",
"version": "version:2@2.7.18.chromium.39"
},
{
"name": "infra/3pp/tools/cpython3/linux-armv6l",
"name": "infra/3pp/tools/cpython3/linux-arm64",
"path": "cipd_bin_packages/cpython3",
"version": "version:2@3.8.10.chromium.19"
},
@ -32945,12 +32945,12 @@
"casSpec": "perf",
"cipd_packages": [
{
"name": "infra/3pp/tools/cpython/linux-armv6l",
"name": "infra/3pp/tools/cpython/linux-arm64",
"path": "cipd_bin_packages/cpython",
"version": "version:2@2.7.18.chromium.39"
},
{
"name": "infra/3pp/tools/cpython3/linux-armv6l",
"name": "infra/3pp/tools/cpython3/linux-arm64",
"path": "cipd_bin_packages/cpython3",
"version": "version:2@3.8.10.chromium.19"
},
@ -33038,12 +33038,12 @@
"casSpec": "perf",
"cipd_packages": [
{
"name": "infra/3pp/tools/cpython/linux-armv6l",
"name": "infra/3pp/tools/cpython/linux-arm64",
"path": "cipd_bin_packages/cpython",
"version": "version:2@2.7.18.chromium.39"
},
{
"name": "infra/3pp/tools/cpython3/linux-armv6l",
"name": "infra/3pp/tools/cpython3/linux-arm64",
"path": "cipd_bin_packages/cpython3",
"version": "version:2@3.8.10.chromium.19"
},
@ -33131,12 +33131,12 @@
"casSpec": "perf",
"cipd_packages": [
{
"name": "infra/3pp/tools/cpython/linux-armv6l",
"name": "infra/3pp/tools/cpython/linux-arm64",
"path": "cipd_bin_packages/cpython",
"version": "version:2@2.7.18.chromium.39"
},
{
"name": "infra/3pp/tools/cpython3/linux-armv6l",
"name": "infra/3pp/tools/cpython3/linux-arm64",
"path": "cipd_bin_packages/cpython3",
"version": "version:2@3.8.10.chromium.19"
},
@ -33224,12 +33224,12 @@
"casSpec": "perf",
"cipd_packages": [
{
"name": "infra/3pp/tools/cpython/linux-armv6l",
"name": "infra/3pp/tools/cpython/linux-arm64",
"path": "cipd_bin_packages/cpython",
"version": "version:2@2.7.18.chromium.39"
},
{
"name": "infra/3pp/tools/cpython3/linux-armv6l",
"name": "infra/3pp/tools/cpython3/linux-arm64",
"path": "cipd_bin_packages/cpython3",
"version": "version:2@3.8.10.chromium.19"
},
@ -60887,12 +60887,12 @@
"casSpec": "test",
"cipd_packages": [
{
"name": "infra/3pp/tools/cpython/linux-armv6l",
"name": "infra/3pp/tools/cpython/linux-arm64",
"path": "cipd_bin_packages/cpython",
"version": "version:2@2.7.18.chromium.39"
},
{
"name": "infra/3pp/tools/cpython3/linux-armv6l",
"name": "infra/3pp/tools/cpython3/linux-arm64",
"path": "cipd_bin_packages/cpython3",
"version": "version:2@3.8.10.chromium.19"
},
@ -60986,12 +60986,12 @@
"casSpec": "test",
"cipd_packages": [
{
"name": "infra/3pp/tools/cpython/linux-armv6l",
"name": "infra/3pp/tools/cpython/linux-arm64",
"path": "cipd_bin_packages/cpython",
"version": "version:2@2.7.18.chromium.39"
},
{
"name": "infra/3pp/tools/cpython3/linux-armv6l",
"name": "infra/3pp/tools/cpython3/linux-arm64",
"path": "cipd_bin_packages/cpython3",
"version": "version:2@3.8.10.chromium.19"
},
@ -61085,12 +61085,12 @@
"casSpec": "test",
"cipd_packages": [
{
"name": "infra/3pp/tools/cpython/linux-armv6l",
"name": "infra/3pp/tools/cpython/linux-arm64",
"path": "cipd_bin_packages/cpython",
"version": "version:2@2.7.18.chromium.39"
},
{
"name": "infra/3pp/tools/cpython3/linux-armv6l",
"name": "infra/3pp/tools/cpython3/linux-arm64",
"path": "cipd_bin_packages/cpython3",
"version": "version:2@3.8.10.chromium.19"
},
@ -61184,12 +61184,12 @@
"casSpec": "test",
"cipd_packages": [
{
"name": "infra/3pp/tools/cpython/linux-armv6l",
"name": "infra/3pp/tools/cpython/linux-arm64",
"path": "cipd_bin_packages/cpython",
"version": "version:2@2.7.18.chromium.39"
},
{
"name": "infra/3pp/tools/cpython3/linux-armv6l",
"name": "infra/3pp/tools/cpython3/linux-arm64",
"path": "cipd_bin_packages/cpython3",
"version": "version:2@3.8.10.chromium.19"
},
@ -61283,12 +61283,12 @@
"casSpec": "test",
"cipd_packages": [
{
"name": "infra/3pp/tools/cpython/linux-armv6l",
"name": "infra/3pp/tools/cpython/linux-arm64",
"path": "cipd_bin_packages/cpython",
"version": "version:2@2.7.18.chromium.39"
},
{
"name": "infra/3pp/tools/cpython3/linux-armv6l",
"name": "infra/3pp/tools/cpython3/linux-arm64",
"path": "cipd_bin_packages/cpython3",
"version": "version:2@3.8.10.chromium.19"
},
@ -61382,12 +61382,12 @@
"casSpec": "test",
"cipd_packages": [
{
"name": "infra/3pp/tools/cpython/linux-armv6l",
"name": "infra/3pp/tools/cpython/linux-arm64",
"path": "cipd_bin_packages/cpython",
"version": "version:2@2.7.18.chromium.39"
},
{
"name": "infra/3pp/tools/cpython3/linux-armv6l",
"name": "infra/3pp/tools/cpython3/linux-arm64",
"path": "cipd_bin_packages/cpython3",
"version": "version:2@3.8.10.chromium.19"
},
@ -61481,12 +61481,12 @@
"casSpec": "test",
"cipd_packages": [
{
"name": "infra/3pp/tools/cpython/linux-armv6l",
"name": "infra/3pp/tools/cpython/linux-arm64",
"path": "cipd_bin_packages/cpython",
"version": "version:2@2.7.18.chromium.39"
},
{
"name": "infra/3pp/tools/cpython3/linux-armv6l",
"name": "infra/3pp/tools/cpython3/linux-arm64",
"path": "cipd_bin_packages/cpython3",
"version": "version:2@3.8.10.chromium.19"
},
@ -61580,12 +61580,12 @@
"casSpec": "test",
"cipd_packages": [
{
"name": "infra/3pp/tools/cpython/linux-armv6l",
"name": "infra/3pp/tools/cpython/linux-arm64",
"path": "cipd_bin_packages/cpython",
"version": "version:2@2.7.18.chromium.39"
},
{
"name": "infra/3pp/tools/cpython3/linux-armv6l",
"name": "infra/3pp/tools/cpython3/linux-arm64",
"path": "cipd_bin_packages/cpython3",
"version": "version:2@3.8.10.chromium.19"
},
@ -61679,12 +61679,12 @@
"casSpec": "test",
"cipd_packages": [
{
"name": "infra/3pp/tools/cpython/linux-armv6l",
"name": "infra/3pp/tools/cpython/linux-arm64",
"path": "cipd_bin_packages/cpython",
"version": "version:2@2.7.18.chromium.39"
},
{
"name": "infra/3pp/tools/cpython3/linux-armv6l",
"name": "infra/3pp/tools/cpython3/linux-arm64",
"path": "cipd_bin_packages/cpython3",
"version": "version:2@3.8.10.chromium.19"
},
@ -61778,12 +61778,12 @@
"casSpec": "test",
"cipd_packages": [
{
"name": "infra/3pp/tools/cpython/linux-armv6l",
"name": "infra/3pp/tools/cpython/linux-arm64",
"path": "cipd_bin_packages/cpython",
"version": "version:2@2.7.18.chromium.39"
},
{
"name": "infra/3pp/tools/cpython3/linux-armv6l",
"name": "infra/3pp/tools/cpython3/linux-arm64",
"path": "cipd_bin_packages/cpython3",
"version": "version:2@3.8.10.chromium.19"
},
@ -61877,12 +61877,12 @@
"casSpec": "test",
"cipd_packages": [
{
"name": "infra/3pp/tools/cpython/linux-armv6l",
"name": "infra/3pp/tools/cpython/linux-arm64",
"path": "cipd_bin_packages/cpython",
"version": "version:2@2.7.18.chromium.39"
},
{
"name": "infra/3pp/tools/cpython3/linux-armv6l",
"name": "infra/3pp/tools/cpython3/linux-arm64",
"path": "cipd_bin_packages/cpython3",
"version": "version:2@3.8.10.chromium.19"
},
@ -61976,12 +61976,12 @@
"casSpec": "test",
"cipd_packages": [
{
"name": "infra/3pp/tools/cpython/linux-armv6l",
"name": "infra/3pp/tools/cpython/linux-arm64",
"path": "cipd_bin_packages/cpython",
"version": "version:2@2.7.18.chromium.39"
},
{
"name": "infra/3pp/tools/cpython3/linux-armv6l",
"name": "infra/3pp/tools/cpython3/linux-arm64",
"path": "cipd_bin_packages/cpython3",
"version": "version:2@3.8.10.chromium.19"
},
@ -62075,12 +62075,12 @@
"casSpec": "test",
"cipd_packages": [
{
"name": "infra/3pp/tools/cpython/linux-armv6l",
"name": "infra/3pp/tools/cpython/linux-arm64",
"path": "cipd_bin_packages/cpython",
"version": "version:2@2.7.18.chromium.39"
},
{
"name": "infra/3pp/tools/cpython3/linux-armv6l",
"name": "infra/3pp/tools/cpython3/linux-arm64",
"path": "cipd_bin_packages/cpython3",
"version": "version:2@3.8.10.chromium.19"
},
@ -62174,12 +62174,12 @@
"casSpec": "test",
"cipd_packages": [
{
"name": "infra/3pp/tools/cpython/linux-armv6l",
"name": "infra/3pp/tools/cpython/linux-arm64",
"path": "cipd_bin_packages/cpython",
"version": "version:2@2.7.18.chromium.39"
},
{
"name": "infra/3pp/tools/cpython3/linux-armv6l",
"name": "infra/3pp/tools/cpython3/linux-arm64",
"path": "cipd_bin_packages/cpython3",
"version": "version:2@3.8.10.chromium.19"
},
@ -62273,12 +62273,12 @@
"casSpec": "test",
"cipd_packages": [
{
"name": "infra/3pp/tools/cpython/linux-armv6l",
"name": "infra/3pp/tools/cpython/linux-arm64",
"path": "cipd_bin_packages/cpython",
"version": "version:2@2.7.18.chromium.39"
},
{
"name": "infra/3pp/tools/cpython3/linux-armv6l",
"name": "infra/3pp/tools/cpython3/linux-arm64",
"path": "cipd_bin_packages/cpython3",
"version": "version:2@3.8.10.chromium.19"
},
@ -62372,12 +62372,12 @@
"casSpec": "test",
"cipd_packages": [
{
"name": "infra/3pp/tools/cpython/linux-armv6l",
"name": "infra/3pp/tools/cpython/linux-arm64",
"path": "cipd_bin_packages/cpython",
"version": "version:2@2.7.18.chromium.39"
},
{
"name": "infra/3pp/tools/cpython3/linux-armv6l",
"name": "infra/3pp/tools/cpython3/linux-arm64",
"path": "cipd_bin_packages/cpython3",
"version": "version:2@3.8.10.chromium.19"
},
@ -62471,12 +62471,12 @@
"casSpec": "test",
"cipd_packages": [
{
"name": "infra/3pp/tools/cpython/linux-armv6l",
"name": "infra/3pp/tools/cpython/linux-arm64",
"path": "cipd_bin_packages/cpython",
"version": "version:2@2.7.18.chromium.39"
},
{
"name": "infra/3pp/tools/cpython3/linux-armv6l",
"name": "infra/3pp/tools/cpython3/linux-arm64",
"path": "cipd_bin_packages/cpython3",
"version": "version:2@3.8.10.chromium.19"
},
@ -62570,12 +62570,12 @@
"casSpec": "test",
"cipd_packages": [
{
"name": "infra/3pp/tools/cpython/linux-armv6l",
"name": "infra/3pp/tools/cpython/linux-arm64",
"path": "cipd_bin_packages/cpython",
"version": "version:2@2.7.18.chromium.39"
},
{
"name": "infra/3pp/tools/cpython3/linux-armv6l",
"name": "infra/3pp/tools/cpython3/linux-arm64",
"path": "cipd_bin_packages/cpython3",
"version": "version:2@3.8.10.chromium.19"
},
@ -62669,12 +62669,12 @@
"casSpec": "test",
"cipd_packages": [
{
"name": "infra/3pp/tools/cpython/linux-armv6l",
"name": "infra/3pp/tools/cpython/linux-arm64",
"path": "cipd_bin_packages/cpython",
"version": "version:2@2.7.18.chromium.39"
},
{
"name": "infra/3pp/tools/cpython3/linux-armv6l",
"name": "infra/3pp/tools/cpython3/linux-arm64",
"path": "cipd_bin_packages/cpython3",
"version": "version:2@3.8.10.chromium.19"
},
@ -62768,12 +62768,12 @@
"casSpec": "test",
"cipd_packages": [
{
"name": "infra/3pp/tools/cpython/linux-armv6l",
"name": "infra/3pp/tools/cpython/linux-arm64",
"path": "cipd_bin_packages/cpython",
"version": "version:2@2.7.18.chromium.39"
},
{
"name": "infra/3pp/tools/cpython3/linux-armv6l",
"name": "infra/3pp/tools/cpython3/linux-arm64",
"path": "cipd_bin_packages/cpython3",
"version": "version:2@3.8.10.chromium.19"
},