luci+mb+testing: rename android-kitkat-arm-rel-swarming to lollipop
Should be landed together with crrev.com/c/2166340
No-Try: true
Bug: 1032336
Change-Id: Ib2676220e06520e66e609d589892e60e3ea4735d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2165660
Commit-Queue: Haiyang Pan <[email protected]>
Reviewed-by: Ben Pastene <[email protected]>
Cr-Commit-Position: refs/heads/master@{#762590}
diff --git a/testing/buildbot/chrome.ci.json b/testing/buildbot/chrome.ci.json
index 71e9349..21ac5ba7 100644
--- a/testing/buildbot/chrome.ci.json
+++ b/testing/buildbot/chrome.ci.json
@@ -1,7 +1,7 @@
{
"AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
"AAAAA2 See generate_buildbot_json.py to make changes": {},
- "android-kitkat-arm-rel-swarming": {
+ "android-lollipop-arm-rel-swarming": {
"gtest_tests": [
{
"args": [
diff --git a/testing/buildbot/chromium.dev.json b/testing/buildbot/chromium.dev.json
index 1b6678b..bbeb3ff 100644
--- a/testing/buildbot/chromium.dev.json
+++ b/testing/buildbot/chromium.dev.json
@@ -1,7 +1,7 @@
{
"AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
"AAAAA2 See generate_buildbot_json.py to make changes": {},
- "android-kitkat-arm-rel-swarming": {
+ "android-lollipop-arm-rel-swarming": {
"gtest_tests": [
{
"args": [
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index 945cc63..f7512bd 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -653,7 +653,7 @@
'shards': 25,
},
},
- 'android-kitkat-arm-rel-swarming': {
+ 'android-lollipop-arm-rel-swarming': {
'swarming': {
'service_account': '[email protected]'
},
@@ -2433,7 +2433,7 @@
'android-asan', # https://crbug.com/964562
# On chromium.swarm, this should possibly be being run (or removed
# from android-marshmallow-arm64-rel-swarming).
- 'android-kitkat-arm-rel-swarming',
+ 'android-lollipop-arm-rel-swarming',
'android-code-coverage-native', # https://crbug.com/1018431
],
'modifications': {
diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
index ce48d4e..a7f6bf8 100644
--- a/testing/buildbot/waterfalls.pyl
+++ b/testing/buildbot/waterfalls.pyl
@@ -1530,7 +1530,7 @@
'name': 'chromium.dev',
'mixins': ['chromium-tester-dev-service-account'],
'machines': {
- 'android-kitkat-arm-rel-swarming': {
+ 'android-lollipop-arm-rel-swarming': {
'mixins': [
'chromium-template-pool',
'kitkat_or_lollipop',
