rename builders using swarming dev

This follows crbug.com/955013, but added -swarming suffix due to builder
name in test_suite_exceptions.pyl.

test_suite_exceptions.pyl does not distinguish
android-marshmallow-arm64-rel under chromium.android or chromium.swarm

Bug: 955013
Change-Id: I5be20bbf312bda9353071f9d11540492d7f57a76
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2026917
Auto-Submit: Takuto Ikuta <tikuta@chromium.org>
Reviewed-by: Yoshisato Yanagisawa <yyanagisawa@google.com>
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#736267}

infra/config/dev/buckets/ci.star

@@ -53,23 +53,23 @@ def ci_builder(*, name, **kwargs):
   )
 
 ci_builder(
-    name = 'Android N5 Swarm',
+    name = 'android-kitkat-arm-rel-swarming',
 )
 
 ci_builder(
-    name = 'Android N5X Swarm',
+    name = 'android-marshmallow-arm64-rel-swarming',
 )
 
 ci_builder(
-    name = 'Linux Swarm',
+    name = 'linux-rel-swarming',
 )
 
 ci_builder(
-    name = 'Mac Swarm',
+    name = 'mac-rel-swarming',
     os = os.MAC_DEFAULT,
 )
 
 ci_builder(
-    name = 'Windows Swarm',
+    name = 'win-rel-swarming',
     os = os.WINDOWS_DEFAULT,
 )

infra/config/dev/consoles/chromium.swarm.star

@@ -3,10 +3,10 @@ luci.console_view(
     header = '//dev/consoles/chromium-header.textpb',
     repo = 'https://chromium.googlesource.com/chromium/src',
     entries = [
-        luci.console_view_entry(builder = 'ci/Android N5 Swarm'),
-        luci.console_view_entry(builder = 'ci/Android N5X Swarm'),
-        luci.console_view_entry(builder = 'ci/Linux Swarm'),
-        luci.console_view_entry(builder = 'ci/Mac Swarm'),
-        luci.console_view_entry(builder = 'ci/Windows Swarm'),
+        luci.console_view_entry(builder = 'ci/android-kitkat-arm-rel-swarming'),
+        luci.console_view_entry(builder = 'ci/android-marshmallow-arm64-rel-swarming'),
+        luci.console_view_entry(builder = 'ci/linux-rel-swarming'),
+        luci.console_view_entry(builder = 'ci/mac-rel-swarming'),
+        luci.console_view_entry(builder = 'ci/win-rel-swarming'),
    ],
 )

infra/config/generated/cr-buildbucket-dev.cfg

@@ -23,7 +23,7 @@ buckets: <
   >
   swarming: <
     builders: <
-      name: "Android N5 Swarm"
+      name: "android-kitkat-arm-rel-swarming"
       swarming_host: "chromium-swarm-dev.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -39,7 +39,7 @@ buckets: <
       service_account: "chromium-ci-builder-dev@chops-service-accounts.iam.gserviceaccount.com"
     >
     builders: <
-      name: "Android N5X Swarm"
+      name: "android-marshmallow-arm64-rel-swarming"
       swarming_host: "chromium-swarm-dev.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -55,7 +55,7 @@ buckets: <
       service_account: "chromium-ci-builder-dev@chops-service-accounts.iam.gserviceaccount.com"
     >
     builders: <
-      name: "Linux Swarm"
+      name: "linux-rel-swarming"
       swarming_host: "chromium-swarm-dev.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -71,7 +71,7 @@ buckets: <
       service_account: "chromium-ci-builder-dev@chops-service-accounts.iam.gserviceaccount.com"
     >
     builders: <
-      name: "Mac Swarm"
+      name: "mac-rel-swarming"
       swarming_host: "chromium-swarm-dev.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"
@@ -87,7 +87,7 @@ buckets: <
       service_account: "chromium-ci-builder-dev@chops-service-accounts.iam.gserviceaccount.com"
     >
     builders: <
-      name: "Windows Swarm"
+      name: "win-rel-swarming"
       swarming_host: "chromium-swarm-dev.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
       dimensions: "cpu:x86-64"

infra/config/generated/luci-milo-dev.cfg

@@ -11,19 +11,19 @@ consoles: <
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
   builders: <
-    name: "buildbucket/luci.chromium.ci/Android N5 Swarm"
+    name: "buildbucket/luci.chromium.ci/android-kitkat-arm-rel-swarming"
   >
   builders: <
-    name: "buildbucket/luci.chromium.ci/Android N5X Swarm"
+    name: "buildbucket/luci.chromium.ci/android-marshmallow-arm64-rel-swarming"
   >
   builders: <
-    name: "buildbucket/luci.chromium.ci/Linux Swarm"
+    name: "buildbucket/luci.chromium.ci/linux-rel-swarming"
   >
   builders: <
-    name: "buildbucket/luci.chromium.ci/Mac Swarm"
+    name: "buildbucket/luci.chromium.ci/mac-rel-swarming"
   >
   builders: <
-    name: "buildbucket/luci.chromium.ci/Windows Swarm"
+    name: "buildbucket/luci.chromium.ci/win-rel-swarming"
   >
   header: <
     oncalls: <

infra/config/generated/luci-scheduler-dev.cfg

@@ -5,68 +5,68 @@
 #   https://luci-config.appspot.com/schemas/projects:luci-scheduler.cfg
 
 job: <
-  id: "Android N5 Swarm"
-  acl_sets: "ci"
+  id: "Snapshot Builder"
+  schedule: "with 300s interval"
+  acl_sets: "cron"
   buildbucket: <
     server: "cr-buildbucket-dev.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Android N5 Swarm"
+    bucket: "luci.chromium.cron"
+    builder: "Snapshot Builder"
   >
 >
 job: <
-  id: "Android N5X Swarm"
+  id: "android-kitkat-arm-rel-swarming"
   acl_sets: "ci"
   buildbucket: <
     server: "cr-buildbucket-dev.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "Android N5X Swarm"
+    builder: "android-kitkat-arm-rel-swarming"
   >
 >
 job: <
-  id: "Linux Swarm"
+  id: "android-marshmallow-arm64-rel-swarming"
   acl_sets: "ci"
   buildbucket: <
     server: "cr-buildbucket-dev.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "Linux Swarm"
+    builder: "android-marshmallow-arm64-rel-swarming"
   >
 >
 job: <
-  id: "Mac Swarm"
+  id: "linux-rel-swarming"
   acl_sets: "ci"
   buildbucket: <
     server: "cr-buildbucket-dev.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "Mac Swarm"
+    builder: "linux-rel-swarming"
   >
 >
 job: <
-  id: "Snapshot Builder"
-  schedule: "with 300s interval"
-  acl_sets: "cron"
+  id: "mac-rel-swarming"
+  acl_sets: "ci"
   buildbucket: <
     server: "cr-buildbucket-dev.appspot.com"
-    bucket: "luci.chromium.cron"
-    builder: "Snapshot Builder"
+    bucket: "luci.chromium.ci"
+    builder: "mac-rel-swarming"
   >
 >
 job: <
-  id: "Windows Swarm"
+  id: "win-rel-swarming"
   acl_sets: "ci"
   buildbucket: <
     server: "cr-buildbucket-dev.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "Windows Swarm"
+    builder: "win-rel-swarming"
   >
 >
 trigger: <
   id: "master-gitiles-trigger"
   acl_sets: "ci"
-  triggers: "Android N5 Swarm"
-  triggers: "Android N5X Swarm"
-  triggers: "Linux Swarm"
-  triggers: "Mac Swarm"
-  triggers: "Windows Swarm"
+  triggers: "android-kitkat-arm-rel-swarming"
+  triggers: "android-marshmallow-arm64-rel-swarming"
+  triggers: "linux-rel-swarming"
+  triggers: "mac-rel-swarming"
+  triggers: "win-rel-swarming"
   gitiles: <
     repo: "https://chromium.googlesource.com/chromium/src"
     refs: "regexp:refs/heads/master"

testing/buildbot/chromium.swarm.json

 {
   "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
   "AAAAA2 See generate_buildbot_json.py to make changes": {},
-  "Android N5 Swarm": {
+  "android-kitkat-arm-rel-swarming": {
     "gtest_tests": [
       {
         "args": [
@@ -333,7 +333,7 @@
       }
     ]
   },
-  "Android N5X Swarm": {
+  "android-marshmallow-arm64-rel-swarming": {
     "gtest_tests": [
       {
         "args": [
@@ -712,7 +712,7 @@
       }
     ]
   },
-  "Linux Swarm": {
+  "linux-rel-swarming": {
     "gtest_tests": [
       {
         "merge": {
@@ -836,7 +836,7 @@
       }
     ]
   },
-  "Mac Swarm": {
+  "mac-rel-swarming": {
     "gtest_tests": [
       {
         "merge": {
@@ -906,7 +906,7 @@
       }
     ]
   },
-  "Windows Swarm": {
+  "win-rel-swarming": {
     "gtest_tests": [
       {
         "merge": {

testing/buildbot/test_suite_exceptions.pyl

@@ -1644,11 +1644,6 @@
       'android-marshmallow-arm64-rel',
     ],
     'modifications': {
-      'Android N5X Swarm': {
-        'swarming': {
-          'shards': 8,
-        },
-      },
       'Linux ASan LSan Tests (1)': {
         # These are slow on the ASAN trybot for some reason.
         # crbug.com/794372
@@ -1685,6 +1680,11 @@
           '--test-launcher-filter-file=../../testing/buildbot/filters/android.asan.unit_tests.filter',
         ],
       },
+      'android-marshmallow-arm64-rel-swarming': {
+        'swarming': {
+          'shards': 8,
+        },
+      },
       'android-pie-arm64-rel': {
         'experiment_percentage': 100, # https://crbug.com/1010211
       },
@@ -2190,8 +2190,8 @@
       'ToTAndroid',
       'android-asan',  # https://crbug.com/964562
       # On chromium.swarm, this should possibly be being run (or removed
-      # from Android N5X Swarm).
-      'Android N5 Swarm',
+      # from android-marshmallow-arm64-rel-swarming).
+      'android-kitkat-arm-rel-swarming',
       'android-code-coverage-native', # https://crbug.com/1018431
     ],
     'modifications': {

testing/buildbot/waterfalls.pyl

@@ -3981,7 +3981,7 @@
   {
     'name': 'chromium.swarm',
     'machines': {
-      'Android N5 Swarm': {
+      'android-kitkat-arm-rel-swarming': {
         'mixins': [
           'kitkat',
           'hammerhead',
@@ -3994,7 +3994,7 @@
         },
         'os_type': 'android',
       },
-      'Android N5X Swarm': {
+      'android-marshmallow-arm64-rel-swarming': {
         'test_suites': {
            'gtest_tests': 'chromium_swarm_android_gtests',
         },
@@ -4010,7 +4010,7 @@
         },
         'os_type': 'android',
       },
-      'Linux Swarm': {
+      'linux-rel-swarming': {
         'mixins': [
           'linux-xenial',
         ],
@@ -4018,12 +4018,12 @@
            'gtest_tests': 'chromium_swarm_linux_gtests',
         },
       },
-      'Mac Swarm': {
+      'mac-rel-swarming': {
         'test_suites': {
            'gtest_tests': 'chromium_swarm_desktop_gtests',
         },
       },
-      'Windows Swarm': {
+      'win-rel-swarming': {
         'test_suites': {
            'gtest_tests': 'chromium_swarm_desktop_gtests',
         },

tools/mb/mb_config.pyl

@@ -537,19 +537,19 @@
 
     'chromium.swarm': {
       # This should be the same with 'android-kitkat-arm-rel'.
-      'Android N5 Swarm': 'android_release_bot_minimal_symbols_fastbuild',
+      'android-kitkat-arm-rel-swarming': 'android_release_bot_minimal_symbols_fastbuild',
 
       # This should be the same with 'android-marshmallow-arm64-rel'.
-      'Android N5X Swarm':  'gpu_tests_android_release_bot_minimal_symbols_arm64_fastbuild',
+      'android-marshmallow-arm64-rel-swarming':  'gpu_tests_android_release_bot_minimal_symbols_arm64_fastbuild',
 
       # This should be the same with 'Linux Builder'.
-      'Linux Swarm': 'gpu_tests_release_bot',
+      'linux-rel-swarming': 'gpu_tests_release_bot',
 
       # This should be the same with 'Mac Builder'.
-      'Mac Swarm': 'gpu_tests_release_bot_minimal_symbols',
+      'mac-rel-swarming': 'gpu_tests_release_bot_minimal_symbols',
 
       # This should be the same with 'Win x64 Builder'.
-      'Windows Swarm': 'gpu_tests_release_bot_minimal_symbols',
+      'win-rel-swarming': 'gpu_tests_release_bot_minimal_symbols',
     },
 
     'client.nacl.sdk': {