The Debian10 bots in the skolo are now 10.10 instead of 10.3.
Change-Id: Ic11c25f8d2ca844c7b52384805df5454819ba6d4
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/441061
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
(cherry picked from commit edad81e7c509823b5cf6f9b081793d17bc3a71ef)
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/441396
Commit-Queue: Ravi Mistry <rmistry@google.com>
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
diff --git a/infra/bots/gen_tasks_logic/gen_tasks_logic.go b/infra/bots/gen_tasks_logic/gen_tasks_logic.go
index 7acc781..bb65e22 100644
--- a/infra/bots/gen_tasks_logic/gen_tasks_logic.go
+++ b/infra/bots/gen_tasks_logic/gen_tasks_logic.go
@@ -56,7 +56,7 @@
ISOLATE_SDK_LINUX_NAME = "Housekeeper-PerCommit-IsolateAndroidSDKLinux"
ISOLATE_WIN_TOOLCHAIN_NAME = "Housekeeper-PerCommit-IsolateWinToolchain"
- DEFAULT_OS_DEBIAN = "Debian-10.3"
+ DEFAULT_OS_DEBIAN = "Debian-10.10"
DEFAULT_OS_LINUX_GCE = "Debian-10.3"
OLD_OS_LINUX_GCE = "Debian-9.8"
COMPILE_TASK_NAME_OS_LINUX = "Debian10"
@@ -881,6 +881,12 @@
log.Fatalf("Entry %q not found in Ubuntu GPU mapping.", b.parts["cpu_or_gpu_value"])
}
d["gpu"] = gpu
+
+ // The Debian10 machines in the skolo are 10.10, not 10.3.
+ if b.matchOs("Debian") {
+ d["os"] = DEFAULT_OS_DEBIAN
+ }
+
} else if b.matchOs("Mac") {
gpu, ok := map[string]string{
"AppleM1": "AppleM1",
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index d5a1373..787ed26 100755
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -24908,7 +24908,7 @@
],
"dimensions": [
"gpu:8086:22b1",
- "os:Debian-10.3",
+ "os:Debian-10.10",
"pool:Skia"
],
"env_prefixes": {
@@ -25018,7 +25018,7 @@
],
"dimensions": [
"gpu:8086:22b1",
- "os:Debian-10.3",
+ "os:Debian-10.10",
"pool:Skia"
],
"env_prefixes": {
@@ -25133,7 +25133,7 @@
],
"dimensions": [
"gpu:8086:5926",
- "os:Debian-10.3",
+ "os:Debian-10.10",
"pool:Skia"
],
"env_prefixes": {
@@ -25238,7 +25238,7 @@
],
"dimensions": [
"gpu:8086:5926",
- "os:Debian-10.3",
+ "os:Debian-10.10",
"pool:Skia"
],
"env_prefixes": {
@@ -25348,7 +25348,7 @@
],
"dimensions": [
"gpu:8086:5926",
- "os:Debian-10.3",
+ "os:Debian-10.10",
"pool:Skia"
],
"env_prefixes": {
@@ -25458,7 +25458,7 @@
],
"dimensions": [
"gpu:8086:5926",
- "os:Debian-10.3",
+ "os:Debian-10.10",
"pool:Skia"
],
"env_prefixes": {
@@ -25563,7 +25563,7 @@
],
"dimensions": [
"gpu:8086:0f31",
- "os:Debian-10.3",
+ "os:Debian-10.10",
"pool:Skia"
],
"env_prefixes": {
@@ -25668,7 +25668,7 @@
],
"dimensions": [
"gpu:8086:0102",
- "os:Debian-10.3",
+ "os:Debian-10.10",
"pool:Skia"
],
"env_prefixes": {
@@ -42548,7 +42548,7 @@
],
"dimensions": [
"gpu:8086:22b1",
- "os:Debian-10.3",
+ "os:Debian-10.10",
"pool:Skia"
],
"env_prefixes": {
@@ -42664,7 +42664,7 @@
],
"dimensions": [
"gpu:8086:22b1",
- "os:Debian-10.3",
+ "os:Debian-10.10",
"pool:Skia"
],
"env_prefixes": {
@@ -42775,7 +42775,7 @@
],
"dimensions": [
"gpu:8086:22b1",
- "os:Debian-10.3",
+ "os:Debian-10.10",
"pool:Skia"
],
"env_prefixes": {
@@ -42891,7 +42891,7 @@
],
"dimensions": [
"gpu:8086:22b1",
- "os:Debian-10.3",
+ "os:Debian-10.10",
"pool:Skia"
],
"env_prefixes": {
@@ -43002,7 +43002,7 @@
],
"dimensions": [
"gpu:8086:5926",
- "os:Debian-10.3",
+ "os:Debian-10.10",
"pool:Skia"
],
"env_prefixes": {
@@ -43118,7 +43118,7 @@
],
"dimensions": [
"gpu:8086:5926",
- "os:Debian-10.3",
+ "os:Debian-10.10",
"pool:Skia"
],
"env_prefixes": {
@@ -43228,7 +43228,7 @@
],
"dimensions": [
"gpu:8086:5926",
- "os:Debian-10.3",
+ "os:Debian-10.10",
"pool:Skia"
],
"env_prefixes": {
@@ -43344,7 +43344,7 @@
],
"dimensions": [
"gpu:8086:5926",
- "os:Debian-10.3",
+ "os:Debian-10.10",
"pool:Skia"
],
"env_prefixes": {
@@ -43455,7 +43455,7 @@
],
"dimensions": [
"gpu:8086:5926",
- "os:Debian-10.3",
+ "os:Debian-10.10",
"pool:Skia"
],
"env_prefixes": {
@@ -43570,7 +43570,7 @@
],
"dimensions": [
"gpu:8086:5926",
- "os:Debian-10.3",
+ "os:Debian-10.10",
"pool:Skia"
],
"env_prefixes": {
@@ -43680,7 +43680,7 @@
],
"dimensions": [
"gpu:8086:5926",
- "os:Debian-10.3",
+ "os:Debian-10.10",
"pool:Skia"
],
"env_prefixes": {
@@ -43795,7 +43795,7 @@
],
"dimensions": [
"gpu:8086:5926",
- "os:Debian-10.3",
+ "os:Debian-10.10",
"pool:Skia"
],
"env_prefixes": {
@@ -43905,7 +43905,7 @@
],
"dimensions": [
"gpu:8086:5926",
- "os:Debian-10.3",
+ "os:Debian-10.10",
"pool:Skia"
],
"env_prefixes": {
@@ -44016,7 +44016,7 @@
],
"dimensions": [
"gpu:8086:5926",
- "os:Debian-10.3",
+ "os:Debian-10.10",
"pool:Skia"
],
"env_prefixes": {
@@ -44131,7 +44131,7 @@
],
"dimensions": [
"gpu:8086:5926",
- "os:Debian-10.3",
+ "os:Debian-10.10",
"pool:Skia"
],
"env_prefixes": {
@@ -44241,7 +44241,7 @@
],
"dimensions": [
"gpu:8086:5926",
- "os:Debian-10.3",
+ "os:Debian-10.10",
"pool:Skia"
],
"env_prefixes": {
@@ -44356,7 +44356,7 @@
],
"dimensions": [
"gpu:8086:5926",
- "os:Debian-10.3",
+ "os:Debian-10.10",
"pool:Skia"
],
"env_prefixes": {
@@ -44466,7 +44466,7 @@
],
"dimensions": [
"gpu:8086:5926",
- "os:Debian-10.3",
+ "os:Debian-10.10",
"pool:Skia"
],
"env_prefixes": {
@@ -44581,7 +44581,7 @@
],
"dimensions": [
"gpu:8086:5926",
- "os:Debian-10.3",
+ "os:Debian-10.10",
"pool:Skia"
],
"env_prefixes": {
@@ -44692,7 +44692,7 @@
],
"dimensions": [
"gpu:8086:0f31",
- "os:Debian-10.3",
+ "os:Debian-10.10",
"pool:Skia"
],
"env_prefixes": {
@@ -44803,7 +44803,7 @@
],
"dimensions": [
"gpu:8086:0f31",
- "os:Debian-10.3",
+ "os:Debian-10.10",
"pool:Skia"
],
"env_prefixes": {
@@ -44914,7 +44914,7 @@
],
"dimensions": [
"gpu:8086:0102",
- "os:Debian-10.3",
+ "os:Debian-10.10",
"pool:Skia"
],
"env_prefixes": {
@@ -45025,7 +45025,7 @@
],
"dimensions": [
"gpu:8086:0102",
- "os:Debian-10.3",
+ "os:Debian-10.10",
"pool:Skia"
],
"env_prefixes": {
