| Index: scripts/slave/recipes/chromium_trybot.expected/swarming_basic.json
|
| diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_chromium_chromeos_rel.json b/scripts/slave/recipes/chromium_trybot.expected/swarming_basic.json
|
| similarity index 64%
|
| copy from scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_chromium_chromeos_rel.json
|
| copy to scripts/slave/recipes/chromium_trybot.expected/swarming_basic.json
|
| index 77f6d9177a7df06449926b8f252cf0afd37c0337..ff4103861bd0f24bffcde191b850e435a08a023c 100644
|
| --- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_chromium_chromeos_rel.json
|
| +++ b/scripts/slave/recipes/chromium_trybot.expected/swarming_basic.json
|
| @@ -8,7 +8,7 @@
|
| "--master",
|
| "tryserver.chromium",
|
| "--builder",
|
| - "linux_chromium_chromeos_rel",
|
| + "linux_chromium_rel_swarming",
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| @@ -140,35 +140,22 @@
|
| "name": "read test spec",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@path: testing/buildbot/chromium_trybot.json@@@",
|
| - "@@@STEP_LOG_LINE@json.output@[@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"base_unittests\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"platforms\": [@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"linux\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"mac\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ ], @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"test\": \"mojo_common_unittests\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"args\": [@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"--test-launcher-print-test-stdio=always\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ ], @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"chromium_configs\": [@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"chromium_chromeos\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"chromium_chromeos_clang\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ ], @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"platforms\": [@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"linux\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ ], @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"test\": \"sandbox_linux_unittests\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"exclude_builders\": [@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"tryserver.chromium:win_chromium_x64_rel\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ ], @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"test\": \"browser_tests\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| - "@@@STEP_LOG_LINE@json.output@]@@@",
|
| + "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"swarming\": true, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"test\": \"base_unittests\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"platforms\": [@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"linux\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ ]@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"test\": \"browser_tests\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ ]@@@",
|
| + "@@@STEP_LOG_LINE@json.output@}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| },
|
| @@ -182,11 +169,24 @@
|
| "runhooks"
|
| ],
|
| "env": {
|
| - "GYP_DEFINES": "chromeos=1 component=static_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=ChromeOS gomadir='[BUILD]/goma' proprietary_codecs=1 target_arch=x64 use_goma=1"
|
| + "GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]/goma' target_arch=x64 test_isolation_mode=archive test_isolation_outdir=https://isolateserver.appspot.com use_goma=1"
|
| },
|
| "name": "gclient runhooks"
|
| },
|
| {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
|
| + "--version"
|
| + ],
|
| + "name": "swarming.py --version",
|
| + "stdout": "/path/to/tmp/",
|
| + "~followup_annotations": [
|
| + "@@@STEP_TEXT@0.4.8@@@"
|
| + ]
|
| + },
|
| + {
|
| "abort_on_failure": false,
|
| "can_fail_build": false,
|
| "cmd": [
|
| @@ -205,15 +205,140 @@
|
| "[BUILD]/goma",
|
| "--",
|
| "all",
|
| - "base_unittests",
|
| - "mojo_common_unittests",
|
| - "sandbox_linux_unittests",
|
| - "browser_tests",
|
| + "base_unittests_run",
|
| + "browser_tests_run",
|
| "chrome"
|
| ],
|
| "name": "compile (with patch)"
|
| },
|
| {
|
| + "abort_on_failure": true,
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "[BUILD]/scripts/slave/recipe_modules/isolate/resources/find_isolated_tests.py",
|
| + "--build-dir",
|
| + "[SLAVE_BUILD]/src/out/Release",
|
| + "--output-json",
|
| + "/path/to/tmp/json"
|
| + ],
|
| + "name": "find isolated tests",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"base_unittests\": \"[dummy hash for base_unittests]\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"browser_tests\": \"[dummy hash for browser_tests]\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@}@@@",
|
| + "@@@STEP_LOG_END@json.output@@@",
|
| + "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"base_unittests\": \"[dummy hash for base_unittests]\", \"browser_tests\": \"[dummy hash for browser_tests]\"}@@@"
|
| + ]
|
| + },
|
| + {
|
| + "allow_subannotations": true,
|
| + "always_run": 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\", \"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\", \"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",
|
| + "--slave-name=TestSlavename",
|
| + "--build-number=571",
|
| + "--run-python-script",
|
| + "[SLAVE_BUILD]/src/tools/telemetry/run_tests",
|
| + "--browser=release"
|
| + ],
|
| + "name": "telemetry_unittests",
|
| + "seed_steps": [
|
| + "telemetry_unittests",
|
| + "telemetry_perf_unittests"
|
| + ]
|
| + },
|
| + {
|
| + "allow_subannotations": true,
|
| + "always_run": 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\", \"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\", \"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",
|
| + "--slave-name=TestSlavename",
|
| + "--build-number=571",
|
| + "--run-python-script",
|
| + "[SLAVE_BUILD]/src/tools/perf/run_tests",
|
| + "--browser=release"
|
| + ],
|
| + "name": "telemetry_perf_unittests"
|
| + },
|
| + {
|
| + "always_run": true,
|
| + "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",
|
| + "200",
|
| + "--shards",
|
| + "1",
|
| + "--task-name",
|
| + "base_unittests (with patch)/Linux/[dummy hash for base_unittests]/linux_chromium_rel_swarming/571",
|
| + "--dimension",
|
| + "os",
|
| + "Linux",
|
| + "[dummy hash for base_unittests]",
|
| + "--",
|
| + "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
|
| + ],
|
| + "name": "[trigger] base_unittests (with patch)"
|
| + },
|
| + {
|
| + "always_run": true,
|
| + "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",
|
| + "200",
|
| + "--shards",
|
| + "1",
|
| + "--task-name",
|
| + "browser_tests (with patch)/Linux/[dummy hash for browser_tests]/linux_chromium_rel_swarming/571",
|
| + "--dimension",
|
| + "os",
|
| + "Linux",
|
| + "[dummy hash for browser_tests]",
|
| + "--",
|
| + "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
|
| + ],
|
| + "name": "[trigger] browser_tests (with patch)"
|
| + },
|
| + {
|
| "can_fail_build": false,
|
| "cmd": [
|
| "python",
|
| @@ -263,30 +388,21 @@
|
| "name": "deps2submodules"
|
| },
|
| {
|
| - "allow_subannotations": true,
|
| - "always_run": true,
|
| "can_fail_build": false,
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD]/scripts/slave/runtest.py",
|
| - "--target",
|
| + "[SLAVE_BUILD]/src/chrome/test/nacl_test_injection/buildbot_nacl_integration.py",
|
| + "--mode",
|
| "Release",
|
| - "--xvfb",
|
| - "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_chromeos_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium\", \"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_chromeos_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium\", \"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-launcher-summary-output",
|
| - "/path/to/tmp/json",
|
| - "--builder-name=linux_chromium_chromeos_rel",
|
| - "--slave-name=TestSlavename",
|
| - "--build-number=571",
|
| - "--parallel",
|
| - "base_unittests"
|
| + "--json_build_results_output_file",
|
| + "/path/to/tmp/json"
|
| ],
|
| - "name": "base_unittests (with patch)"
|
| + "name": "nacl_integration (with patch)",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@json.output@[]@@@",
|
| + "@@@STEP_LOG_END@json.output@@@"
|
| + ]
|
| },
|
| {
|
| "allow_subannotations": true,
|
| @@ -295,51 +411,24 @@
|
| "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_chromeos_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium\", \"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_chromeos_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium\", \"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-launcher-summary-output",
|
| + "[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",
|
| - "--builder-name=linux_chromium_chromeos_rel",
|
| - "--slave-name=TestSlavename",
|
| - "--build-number=571",
|
| - "--parallel",
|
| - "mojo_common_unittests"
|
| - ],
|
| - "name": "mojo_common_unittests (with patch)"
|
| - },
|
| - {
|
| - "allow_subannotations": true,
|
| - "always_run": true,
|
| - "can_fail_build": false,
|
| - "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_chromeos_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium\", \"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_chromeos_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium\", \"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-launcher-summary-output",
|
| - "/path/to/tmp/json",
|
| - "--builder-name=linux_chromium_chromeos_rel",
|
| - "--slave-name=TestSlavename",
|
| - "--build-number=571",
|
| - "--parallel",
|
| - "sandbox_linux_unittests",
|
| - "--test-launcher-print-test-stdio=always"
|
| + "--",
|
| + "collect",
|
| + "--swarming",
|
| + "https://chromium-swarm.appspot.com",
|
| + "--shards",
|
| + "1",
|
| + "--decorate",
|
| + "--print-status-updates",
|
| + "base_unittests (with patch)/Linux/[dummy hash for base_unittests]/linux_chromium_rel_swarming/571"
|
| ],
|
| - "name": "sandbox_linux_unittests (with patch)"
|
| + "name": "[swarming] base_unittests (with patch)"
|
| },
|
| {
|
| "allow_subannotations": true,
|
| @@ -348,40 +437,23 @@
|
| "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_chromeos_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium\", \"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_chromeos_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium\", \"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-launcher-summary-output",
|
| + "[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",
|
| - "--builder-name=linux_chromium_chromeos_rel",
|
| - "--slave-name=TestSlavename",
|
| - "--build-number=571",
|
| - "--parallel",
|
| - "browser_tests"
|
| - ],
|
| - "name": "browser_tests (with patch)"
|
| - },
|
| - {
|
| - "can_fail_build": false,
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[SLAVE_BUILD]/src/chrome/test/nacl_test_injection/buildbot_nacl_integration.py",
|
| - "--mode",
|
| - "Release",
|
| - "--json_build_results_output_file",
|
| - "/path/to/tmp/json"
|
| + "--",
|
| + "collect",
|
| + "--swarming",
|
| + "https://chromium-swarm.appspot.com",
|
| + "--shards",
|
| + "1",
|
| + "--decorate",
|
| + "--print-status-updates",
|
| + "browser_tests (with patch)/Linux/[dummy hash for browser_tests]/linux_chromium_rel_swarming/571"
|
| ],
|
| - "name": "nacl_integration (with patch)",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@json.output@[]@@@",
|
| - "@@@STEP_LOG_END@json.output@@@"
|
| - ]
|
| + "name": "[swarming] browser_tests (with patch)"
|
| }
|
| ]
|
|
|