| Index: scripts/slave/recipes/chromium_trybot.expected/swarming_basic_try_job.json
|
| diff --git a/scripts/slave/recipes/chromium_trybot.expected/swarming_basic_try_job.json b/scripts/slave/recipes/chromium_trybot.expected/swarming_basic_try_job.json
|
| index 4fd4644f1339720e7de18c02b3108e0cb7eb04d9..70ea57b569196c043541864b4049c888d259f6a6 100644
|
| --- a/scripts/slave/recipes/chromium_trybot.expected/swarming_basic_try_job.json
|
| +++ b/scripts/slave/recipes/chromium_trybot.expected/swarming_basic_try_job.json
|
| @@ -110,27 +110,6 @@
|
| "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| "@@@STEP_LOG_LINE@json.output@ ]@@@",
|
| "@@@STEP_LOG_LINE@json.output@}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py",
|
| - "--output",
|
| - "/path/to/tmp/json",
|
| - "--",
|
| - "--build-config-fs",
|
| - "Release",
|
| - "--paths",
|
| - "{\"build\": \"[BUILD]\"}",
|
| - "--properties",
|
| - "{\"buildername\": \"linux_chromium_rel_swarming\", \"buildnumber\": 571, \"slavename\": \"TestSlavename\"}"
|
| - ],
|
| - "name": "get compile targets for scripts",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| },
|
| @@ -425,12 +404,6 @@
|
| "python",
|
| "-u",
|
| "[SLAVE_BUILD]/src/testing/scripts/checkdeps.py",
|
| - "--build-config-fs",
|
| - "Release",
|
| - "--paths",
|
| - "{\"build\": \"[BUILD]\"}",
|
| - "--properties",
|
| - "{\"buildername\": \"linux_chromium_rel_swarming\", \"buildnumber\": 571, \"slavename\": \"TestSlavename\"}",
|
| "run",
|
| "--output",
|
| "/path/to/tmp/json"
|
| @@ -477,28 +450,31 @@
|
| ]
|
| },
|
| {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[SLAVE_BUILD]/src/testing/scripts/telemetry_unittests.py",
|
| - "--build-config-fs",
|
| + "allow_subannotations": true,
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "[BUILD]/scripts/slave/runtest.py",
|
| + "--target",
|
| "Release",
|
| - "--paths",
|
| - "{\"build\": \"[BUILD]\"}",
|
| - "--properties",
|
| - "{\"buildername\": \"linux_chromium_rel_swarming\", \"buildnumber\": 571, \"slavename\": \"TestSlavename\"}",
|
| - "run",
|
| - "--output",
|
| - "/path/to/tmp/json"
|
| - ],
|
| - "name": "telemetry_unittests (with patch)",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"failures\": [], @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"valid\": true@@@",
|
| - "@@@STEP_LOG_LINE@json.output@}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@"
|
| - ]
|
| + "--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\"}",
|
| + "--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\"}",
|
| + "--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",
|
| + "--retry-limit=3",
|
| + "--write-full-results-to",
|
| + "/path/to/tmp/json"
|
| + ],
|
| + "name": "telemetry_unittests (with patch)"
|
| },
|
| {
|
| "allow_subannotations": true,
|
|
|