| Index: scripts/slave/recipes/chromium_trybot.expected/swarming_deapply_patch.json
|
| diff --git a/scripts/slave/recipes/chromium_trybot.expected/swarming_deapply_patch.json b/scripts/slave/recipes/chromium_trybot.expected/swarming_deapply_patch.json
|
| index 7f5dfe5cbfbb9f450811bb0349833272c24f06f7..e13e2fba07d85277449bee36e69e2982bc072e09 100644
|
| --- a/scripts/slave/recipes/chromium_trybot.expected/swarming_deapply_patch.json
|
| +++ b/scripts/slave/recipes/chromium_trybot.expected/swarming_deapply_patch.json
|
| @@ -7,7 +7,7 @@
|
| "--master",
|
| "tryserver.chromium.linux",
|
| "--builder",
|
| - "linux_chromium_rel_swarming",
|
| + "linux_chromium_rel",
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| @@ -244,7 +244,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",
|
| @@ -263,7 +263,7 @@
|
| "pool",
|
| "Chrome",
|
| "--tag",
|
| - "buildername:linux_chromium_rel_swarming",
|
| + "buildername:linux_chromium_rel",
|
| "--tag",
|
| "buildnumber:571",
|
| "--tag",
|
| @@ -287,9 +287,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\"@@@",
|
| @@ -315,7 +315,7 @@
|
| "--shards",
|
| "1",
|
| "--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",
|
| @@ -334,7 +334,7 @@
|
| "pool",
|
| "Chrome",
|
| "--tag",
|
| - "buildername:linux_chromium_rel_swarming",
|
| + "buildername:linux_chromium_rel",
|
| "--tag",
|
| "buildnumber:571",
|
| "--tag",
|
| @@ -358,9 +358,9 @@
|
| "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\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"browser_tests (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\"@@@",
|
| @@ -431,12 +431,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",
|
| @@ -458,12 +458,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",
|
| @@ -511,7 +511,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)",
|
| "~followup_annotations": [
|
| @@ -540,7 +540,7 @@
|
| "--print-status-updates",
|
| "--shards",
|
| "1",
|
| - "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)"
|
| },
|
| @@ -552,7 +552,7 @@
|
| "--master",
|
| "tryserver.chromium.linux",
|
| "--builder",
|
| - "linux_chromium_rel_swarming",
|
| + "linux_chromium_rel",
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| @@ -679,7 +679,7 @@
|
| "--shards",
|
| "1",
|
| "--task-name",
|
| - "base_unittests (without patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_swarming/571",
|
| + "base_unittests (without patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel/571",
|
| "--dump-json",
|
| "/path/to/tmp/json",
|
| "--expiration",
|
| @@ -698,7 +698,7 @@
|
| "pool",
|
| "Chrome",
|
| "--tag",
|
| - "buildername:linux_chromium_rel_swarming",
|
| + "buildername:linux_chromium_rel",
|
| "--tag",
|
| "buildnumber:571",
|
| "--tag",
|
| @@ -723,9 +723,9 @@
|
| "name": "[trigger] base_unittests (without patch)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"base_unittests (without patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_swarming/571\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"base_unittests (without patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel/571\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"base_unittests (without patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_swarming/571\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"base_unittests (without 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\"@@@",
|
| @@ -756,7 +756,7 @@
|
| "--print-status-updates",
|
| "--shards",
|
| "1",
|
| - "base_unittests (without patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_swarming/571"
|
| + "base_unittests (without patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel/571"
|
| ],
|
| "name": "base_unittests (without patch)"
|
| },
|
|
|