| Index: scripts/slave/recipes/chromium_trybot.expected/swarming_basic_cq.json
|
| diff --git a/scripts/slave/recipes/chromium_trybot.expected/swarming_basic_cq.json b/scripts/slave/recipes/chromium_trybot.expected/swarming_basic_cq.json
|
| index c0a530a0346983d517c602597e23cd2b48ca94c2..1db64a90f91ee284c92140f3517cb23f40a082a7 100644
|
| --- a/scripts/slave/recipes/chromium_trybot.expected/swarming_basic_cq.json
|
| +++ b/scripts/slave/recipes/chromium_trybot.expected/swarming_basic_cq.json
|
| @@ -7,7 +7,7 @@
|
| "--master",
|
| "tryserver.chromium.linux",
|
| "--builder",
|
| - "linux_chromium_rel_swarming",
|
| + "linux_chromium_rel",
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| @@ -248,7 +248,7 @@
|
| "--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",
|
| @@ -267,7 +267,7 @@
|
| "pool",
|
| "Chrome",
|
| "--tag",
|
| - "buildername:linux_chromium_rel_swarming",
|
| + "buildername:linux_chromium_rel",
|
| "--tag",
|
| "buildnumber:571",
|
| "--tag",
|
| @@ -291,9 +291,9 @@
|
| "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\"@@@",
|
| @@ -319,7 +319,7 @@
|
| "--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",
|
| @@ -338,7 +338,7 @@
|
| "pool",
|
| "Chrome",
|
| "--tag",
|
| - "buildername:linux_chromium_rel_swarming",
|
| + "buildername:linux_chromium_rel",
|
| "--tag",
|
| "buildnumber:571",
|
| "--tag",
|
| @@ -362,29 +362,29 @@
|
| "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\"@@@",
|
| @@ -459,12 +459,12 @@
|
| "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\": \"commit-bot@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\": \"commit-bot@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\": \"commit-bot@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\": \"commit-bot@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",
|
| @@ -486,12 +486,12 @@
|
| "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\": \"commit-bot@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\": \"commit-bot@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\": \"commit-bot@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\": \"commit-bot@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",
|
| @@ -539,7 +539,7 @@
|
| "--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)"
|
| },
|
| @@ -563,7 +563,7 @@
|
| "--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)"
|
| }
|
|
|