[switchboard] Switch S20s over to arm64 RPis.
Bug: skia:12063
Change-Id: I47257179d38de0452766ce70857eaf0a920b7abc
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/434156
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Auto-Submit: Joe Gregorio <jcgregorio@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
(cherry picked from commit f1f542cde8a8fc86842e1f0901123127ab77e774)
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/434341
diff --git a/infra/bots/gen_tasks_logic/task_builder.go b/infra/bots/gen_tasks_logic/task_builder.go
index 15209a2..5910051 100644
--- a/infra/bots/gen_tasks_logic/task_builder.go
+++ b/infra/bots/gen_tasks_logic/task_builder.go
@@ -278,6 +278,8 @@
return cipd.PlatformMacAmd64
} else if b.matchArch("Arm64") {
return cipd.PlatformLinuxArm64
+ } else if b.matchModel("GalaxyS20") {
+ return cipd.PlatformLinuxArm64
} else if b.matchOs("Android", "ChromeOS", "iOS") {
return cipd.PlatformLinuxArmv6l
} else {
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index cc465aa..65d5d01 100755
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -20239,12 +20239,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"
},
@@ -20328,12 +20328,12 @@
"casSpec": "skpbench",
"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"
},
@@ -20416,12 +20416,12 @@
"casSpec": "skpbench",
"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"
},
@@ -20504,12 +20504,12 @@
"casSpec": "skpbench",
"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"
},
@@ -20592,12 +20592,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"
},
@@ -20681,12 +20681,12 @@
"casSpec": "skpbench",
"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"
},
@@ -20769,12 +20769,12 @@
"casSpec": "skpbench",
"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"
},
@@ -33367,12 +33367,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"
},
@@ -33456,12 +33456,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"
},
@@ -33545,12 +33545,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"
},
@@ -33634,12 +33634,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"
},
