Switch P30s over to arm64 RPis.
Bug: skia:12063
Change-Id: I05f476072a6219fbce1424b9357fbfcfd905ed58
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/435020
Auto-Submit: Joe Gregorio <jcgregorio@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
diff --git a/infra/bots/gen_tasks_logic/task_builder.go b/infra/bots/gen_tasks_logic/task_builder.go
index 5910051..cdb846f 100644
--- a/infra/bots/gen_tasks_logic/task_builder.go
+++ b/infra/bots/gen_tasks_logic/task_builder.go
@@ -278,7 +278,7 @@
return cipd.PlatformMacAmd64
} else if b.matchArch("Arm64") {
return cipd.PlatformLinuxArm64
- } else if b.matchModel("GalaxyS20") {
+ } else if b.matchModel("GalaxyS20") || b.matchModel("P30") {
return cipd.PlatformLinuxArm64
} else if b.matchOs("Android", "ChromeOS", "iOS") {
return cipd.PlatformLinuxArmv6l
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 65d5d01..4b6f3d5 100755
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -21935,12 +21935,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"
},
@@ -22024,12 +22024,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"
},
@@ -35770,12 +35770,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"
},
@@ -35859,12 +35859,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"
},
@@ -35948,12 +35948,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"
},
@@ -36037,12 +36037,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"
},
@@ -36126,12 +36126,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"
},
@@ -36215,12 +36215,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"
},
@@ -36304,12 +36304,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"
},
