Remove branched Dawn android builders
We only care about top-of-tree, not the branches since WebGPU on
Android is not available beyond Canary yet.
Bug: chromium:1467655, chromium:1467653, chromium:1467916
Change-Id: I27879c86c90cc65607a5d0dd7984afe7aea006be
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/143301
Reviewed-by: Brian Sheedy <bsheedy@google.com>
Commit-Queue: Austin Eng <enga@chromium.org>
Kokoro: Austin Eng <enga@chromium.org>
Reviewed-by: Brandon Jones <bajones@chromium.org>
diff --git a/infra/config/global/generated/commit-queue.cfg b/infra/config/global/generated/commit-queue.cfg
index bde992e..b457f19 100644
--- a/infra/config/global/generated/commit-queue.cfg
+++ b/infra/config/global/generated/commit-queue.cfg
@@ -120,9 +120,6 @@
}
tryjob {
builders {
- name: "chromium-m112/try/dawn-android-arm-deps-rel"
- }
- builders {
name: "chromium-m112/try/dawn-mac-x64-deps-rel"
}
builders {
@@ -198,9 +195,6 @@
}
tryjob {
builders {
- name: "chromium-m113/try/dawn-android-arm-deps-rel"
- }
- builders {
name: "chromium-m113/try/dawn-linux-x64-deps-rel"
}
builders {
@@ -279,9 +273,6 @@
}
tryjob {
builders {
- name: "chromium-m114/try/dawn-android-arm-deps-rel"
- }
- builders {
name: "chromium-m114/try/dawn-linux-x64-deps-rel"
}
builders {
@@ -360,12 +351,6 @@
}
tryjob {
builders {
- name: "chromium-m115/try/dawn-android-arm-deps-rel"
- }
- builders {
- name: "chromium-m115/try/dawn-android-arm64-deps-rel"
- }
- builders {
name: "chromium-m115/try/dawn-linux-x64-deps-rel"
}
builders {
@@ -444,12 +429,6 @@
}
tryjob {
builders {
- name: "chromium-m116/try/dawn-android-arm-deps-rel"
- }
- builders {
- name: "chromium-m116/try/dawn-android-arm64-deps-rel"
- }
- builders {
name: "chromium-m116/try/dawn-linux-x64-deps-rel"
}
builders {
diff --git a/infra/config/global/generated/project.cfg b/infra/config/global/generated/project.cfg
index 8b350be..c95865c 100644
--- a/infra/config/global/generated/project.cfg
+++ b/infra/config/global/generated/project.cfg
@@ -7,7 +7,7 @@
name: "dawn"
access: "group:all"
lucicfg {
- version: "1.39.8"
+ version: "1.39.10"
package_dir: ".."
config_dir: "generated"
entry_point: "main.star"
diff --git a/infra/config/global/main.star b/infra/config/global/main.star
index ace702f..eb67cd1 100755
--- a/infra/config/global/main.star
+++ b/infra/config/global/main.star
@@ -382,8 +382,8 @@
"linux": 112,
"mac": 112,
"win": 112,
- "android-arm": 112,
- "android-arm64": 115,
+ "android-arm": None,
+ "android-arm64": None,
}
def chromium_dawn_tryjob(os, arch = None):
diff --git a/infra/config/global/milestones.json b/infra/config/global/milestones.json
index 1f63d54..fbe212e 100644
--- a/infra/config/global/milestones.json
+++ b/infra/config/global/milestones.json
@@ -5,8 +5,7 @@
"ref": "refs/heads/chromium/5615",
"platforms": [
"mac",
- "win",
- "android"
+ "win"
]
},
"113": {
@@ -16,8 +15,7 @@
"platforms": [
"linux",
"mac",
- "win",
- "android"
+ "win"
]
},
"114": {
@@ -27,8 +25,7 @@
"platforms": [
"linux",
"mac",
- "win",
- "android"
+ "win"
]
},
"115": {
@@ -38,8 +35,7 @@
"platforms": [
"linux",
"mac",
- "win",
- "android"
+ "win"
]
},
"116": {
@@ -49,8 +45,7 @@
"platforms": [
"linux",
"mac",
- "win",
- "android"
+ "win"
]
}
}
\ No newline at end of file
diff --git a/infra/config/scripts/milestones.py b/infra/config/scripts/milestones.py
index 497086b..4fe71f7 100755
--- a/infra/config/scripts/milestones.py
+++ b/infra/config/scripts/milestones.py
@@ -103,7 +103,6 @@
'linux',
'mac',
'win',
- 'android',
],
}
