Remove _swarming bots.

scripts/slave/recipes/chromium_trybot.expected/swarming_basic_try_job.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "[BUILD]/scripts/slave/bot_update.py",
       "--master",
       "tryserver.chromium.linux",
       "--builder",
-      "linux_chromium_rel_swarming",
+      "linux_chromium_rel",
       "--slave",
       "TestSlavename",
       "--spec",
       "cache_dir = None\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]",
       "--root",
       "src",
       "--revision_mapping_file",
       "{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/WebKit\": \"got_webkit_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
       "--issue",
       "12853011",
@@ skipping 220 matching lines @@
       "trigger",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--isolate-server",
       "https://isolateserver.appspot.com",
       "--priority",
       "50",
       "--shards",
       "1",
       "--task-name",
-      "base_unittests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_swarming/571",
+      "base_unittests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel/571",
       "--dump-json",
       "/path/to/tmp/json",
       "--expiration",
       "3600",
       "--io-timeout",
       "1200",
       "--hard-timeout",
       "3600",
       "--dimension",
       "cpu",
       "x86-64",
       "--dimension",
       "os",
       "Ubuntu-12.04",
       "--dimension",
       "pool",
       "Chrome",
       "--tag",
-      "buildername:linux_chromium_rel_swarming",
+      "buildername:linux_chromium_rel",
       "--tag",
       "buildnumber:571",
       "--tag",
       "data:[dummy hash for base_unittests]",
       "--tag",
       "master:tryserver.chromium.linux",
       "--tag",
       "name:base_unittests (with patch)",
       "--tag",
       "os:Ubuntu-12.04",
       "--tag",
       "project:chromium",
       "--tag",
       "purpose:ManualTS",
       "--tag",
       "purpose:pre-commit",
       "[dummy hash for base_unittests]",
       "--",
       "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
     ],
     "name": "[trigger] base_unittests (with patch)",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"base_unittests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_swarming/571\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"base_unittests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel/571\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"base_unittests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_swarming/571\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"base_unittests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel/571\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
       "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
       "trigger",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--isolate-server",
       "https://isolateserver.appspot.com",
       "--priority",
       "50",
       "--shards",
       "5",
       "--task-name",
-      "browser_tests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_swarming/571",
+      "browser_tests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel/571",
       "--dump-json",
       "/path/to/tmp/json",
       "--expiration",
       "3600",
       "--io-timeout",
       "1200",
       "--hard-timeout",
       "3600",
       "--dimension",
       "cpu",
       "x86-64",
       "--dimension",
       "os",
       "Ubuntu-12.04",
       "--dimension",
       "pool",
       "Chrome",
       "--tag",
-      "buildername:linux_chromium_rel_swarming",
+      "buildername:linux_chromium_rel",
       "--tag",
       "buildnumber:571",
       "--tag",
       "data:[dummy hash for browser_tests]",
       "--tag",
       "master:tryserver.chromium.linux",
       "--tag",
       "name:browser_tests (with patch)",
       "--tag",
       "os:Ubuntu-12.04",
       "--tag",
       "project:chromium",
       "--tag",
       "purpose:ManualTS",
       "--tag",
       "purpose:pre-commit",
       "[dummy hash for browser_tests]",
       "--",
       "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
     ],
     "name": "[trigger] browser_tests (with patch)",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"browser_tests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_swarming/571\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"browser_tests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel/571\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"browser_tests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_swarming/571:5:0\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"browser_tests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel/571:5:0\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }, @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"browser_tests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_swarming/571:5:1\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"browser_tests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel/571:5:1\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 1, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10100\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10100\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }, @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"browser_tests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_swarming/571:5:2\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"browser_tests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel/571:5:2\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 2, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10200\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10200\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }, @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"browser_tests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_swarming/571:5:3\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"browser_tests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel/571:5:3\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 3, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10300\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10300\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }, @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"browser_tests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_swarming/571:5:4\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"browser_tests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel/571:5:4\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 4, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10400\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10400\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
       "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@",
       "@@@STEP_LINK@shard #1@https://chromium-swarm.appspot.com/user/task/10100@@@",
       "@@@STEP_LINK@shard #2@https://chromium-swarm.appspot.com/user/task/10200@@@",
@@ skipping 54 matching lines @@
   {
     "allow_subannotations": true,
     "cmd": [
       "python",
       "-u",
       "[BUILD]/scripts/slave/runtest.py",
       "--target",
       "Release",
       "--xvfb",
       "--factory-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_rel_swarming\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.linux\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"joe@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.linux\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"joe@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--build-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_rel_swarming\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.linux\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"joe@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.linux\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"joe@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--annotate=gtest",
       "--test-type=telemetry_unittests",
-      "--builder-name=linux_chromium_rel_swarming",
+      "--builder-name=linux_chromium_rel",
       "--slave-name=TestSlavename",
       "--build-number=571",
       "--run-python-script",
       "[SLAVE_BUILD]/src/tools/telemetry/run_tests",
       "--browser=release",
       "--retry-limit=3",
       "--write-full-results-to",
       "/path/to/tmp/json"
     ],
     "name": "telemetry_unittests (with patch)"
   },
   {
     "allow_subannotations": true,
     "cmd": [
       "python",
       "-u",
       "[BUILD]/scripts/slave/runtest.py",
       "--target",
       "Release",
       "--xvfb",
       "--factory-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_rel_swarming\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.linux\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"joe@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.linux\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"joe@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--build-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_rel_swarming\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.linux\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"joe@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.linux\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"joe@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--annotate=gtest",
       "--test-type=telemetry_perf_unittests",
-      "--builder-name=linux_chromium_rel_swarming",
+      "--builder-name=linux_chromium_rel",
       "--slave-name=TestSlavename",
       "--build-number=571",
       "--run-python-script",
       "[SLAVE_BUILD]/src/tools/perf/run_tests",
       "--browser=release",
       "--retry-limit=3",
       "--write-full-results-to",
       "/path/to/tmp/json"
     ],
     "name": "telemetry_perf_unittests (with patch)"
@@ skipping 27 matching lines @@
       "--merged-test-output",
       "/path/to/tmp/json",
       "--",
       "collect",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--shards",
       "1",
-      "base_unittests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_swarming/571"
+      "base_unittests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel/571"
     ],
     "name": "base_unittests (with patch)"
   },
   {
     "allow_subannotations": true,
     "cmd": [
       "python",
       "-u",
       "[BUILD]/scripts/slave/recipe_modules/swarming/resources/collect_gtest_task.py",
       "--swarming-client-dir",
       "[SLAVE_BUILD]/src/tools/swarming_client",
       "--temp-root-dir",
       "[TMP_BASE]",
       "--merged-test-output",
       "/path/to/tmp/json",
       "--",
       "collect",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--shards",
       "5",
-      "browser_tests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_swarming/571"
+      "browser_tests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel/571"
     ],
     "name": "browser_tests (with patch)"
   }
 ]