scripts/slave/recipes/chromium_trybot.expected/swarming_deapply_patch.json - Issue 313693003: Swarming: conditionally run tests on swarming in chromium_trybot recipe.

Unified Diff: scripts/slave/recipes/chromium_trybot.expected/swarming_deapply_patch.json

Issue 313693003: Swarming: conditionally run tests on swarming in chromium_trybot recipe. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build

Patch Set: Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« scripts/slave/recipes/chromium_trybot.py ('K') | « scripts/slave/recipes/chromium_trybot.expected/swarming_basic.json ('k') | scripts/slave/recipes/chromium_trybot.expected/swarming_missing_isolated.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/chromium_trybot.expected/swarming_deapply_patch.json

diff --git a/scripts/slave/recipes/chromium_trybot.expected/gclient_revert_nuke.json b/scripts/slave/recipes/chromium_trybot.expected/swarming_deapply_patch.json

similarity index 53%

copy from scripts/slave/recipes/chromium_trybot.expected/gclient_revert_nuke.json

copy to scripts/slave/recipes/chromium_trybot.expected/swarming_deapply_patch.json

index 20ef30eed2beaa5ef468c4fe10bf9c1315e77cdd..0b77d474fbf1b94128cdf466b19db323b1c4d080 100644

--- a/scripts/slave/recipes/chromium_trybot.expected/gclient_revert_nuke.json

+++ b/scripts/slave/recipes/chromium_trybot.expected/swarming_deapply_patch.json

@@ -8,7 +8,7 @@

"--master",

"tryserver.chromium",

"--builder",

- "linux_no_bot_update",

+ "linux_chromium_rel_swarming",

"--slave",

"TestSlavename",

"--spec",

@@ -57,11 +57,7 @@

".",

"[DEPOT_TOOLS]/gclient"

- "name": "gclient revert",

- "~followup_annotations": [

- "step returned non-zero exit code: 1",

- "@@@STEP_FAILURE@@@"

- ]

+ "name": "gclient revert"

{

"abort_on_failure": false,

@@ -116,93 +112,6 @@

]

{

- "cmd": [

- "python",

- "-u",

- "\nimport os, sys\nfrom common import chromium_utils\n\nfor p in [os.path.join(sys.argv[1], x) for x in os.listdir(sys.argv[1])]:\n if os.path.isdir(p):\n chromium_utils.RemoveDirectory(p)\n else:\n os.unlink(p)\n",

- "[SLAVE_BUILD]"

- ],

- "name": "rmcontents slave build directory",

- "seed_steps": [

- "rmcontents slave build directory",

- "gclient setup (2)"

- ],

- "~followup_annotations": [

- "@@@STEP_LOG_LINE@python.inline@@@@",

- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",

- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils@@@",

- "@@@STEP_LOG_LINE@python.inline@@@@",

- "@@@STEP_LOG_LINE@python.inline@for p in [os.path.join(sys.argv[1], x) for x in os.listdir(sys.argv[1])]:@@@",

- "@@@STEP_LOG_LINE@python.inline@ if os.path.isdir(p):@@@",

- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(p)@@@",

- "@@@STEP_LOG_LINE@python.inline@ else:@@@",

- "@@@STEP_LOG_LINE@python.inline@ os.unlink(p)@@@",

- "@@@STEP_LOG_END@python.inline@@@"

- ]

- },

- {

- "cmd": [

- "python",

- "-u",

- "[DEPOT_TOOLS]/gclient.py",

- "config",

- "--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'}]"

- ],

- "name": "gclient setup (2)"

- },

- {

- "abort_on_failure": true,

- "cmd": [

- "python",

- "-u",

- "[DEPOT_TOOLS]/gclient.py",

- "sync",

- "--nohooks",

- "--delete_unversioned_trees",

- "--force",

- "--verbose",

- "--output-json",

- "/path/to/tmp/json"

- ],

- "name": "gclient sync (2)",

- "~followup_annotations": [

- "@@@STEP_LOG_LINE@json.output@{@@@",

- "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@",

- "@@@STEP_LOG_LINE@json.output@ \"src/\": {@@@",

- "@@@STEP_LOG_LINE@json.output@ \"revision\": 170242@@@",

- "@@@STEP_LOG_LINE@json.output@ }, @@@",

- "@@@STEP_LOG_LINE@json.output@ \"src/native_client/\": {@@@",

- "@@@STEP_LOG_LINE@json.output@ \"revision\": 274981@@@",

- "@@@STEP_LOG_LINE@json.output@ }, @@@",

- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/WebKit/\": {@@@",

- "@@@STEP_LOG_LINE@json.output@ \"revision\": 124383@@@",

- "@@@STEP_LOG_LINE@json.output@ }, @@@",

- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc/\": {@@@",

- "@@@STEP_LOG_LINE@json.output@ \"revision\": 120644@@@",

- "@@@STEP_LOG_LINE@json.output@ }, @@@",

- "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarm_client/\": {@@@",

- "@@@STEP_LOG_LINE@json.output@ \"revision\": 200767@@@",

- "@@@STEP_LOG_LINE@json.output@ }, @@@",

- "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client/\": {@@@",

- "@@@STEP_LOG_LINE@json.output@ \"revision\": 276089@@@",

- "@@@STEP_LOG_LINE@json.output@ }, @@@",

- "@@@STEP_LOG_LINE@json.output@ \"src/v8/\": {@@@",

- "@@@STEP_LOG_LINE@json.output@ \"revision\": 43426@@@",

- "@@@STEP_LOG_LINE@json.output@ }@@@",

- "@@@STEP_LOG_LINE@json.output@}@@@",

- "@@@STEP_LOG_END@json.output@@@",

- "@@@SET_BUILD_PROPERTY@got_nacl_revision@274981@@@",

- "@@@SET_BUILD_PROPERTY@got_webkit_revision@124383@@@",

- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@276089@@@",

- "@@@SET_BUILD_PROPERTY@got_webrtc_revision@120644@@@",

- "@@@SET_BUILD_PROPERTY@got_revision@170242@@@",

- "@@@SET_BUILD_PROPERTY@got_v8_revision@43426@@@",

- "@@@SET_BUILD_PROPERTY@got_swarm_client_revision@200767@@@"

- ]

- },

- {

"abort_on_failure": true,

"cmd": [

"python",

@@ -231,35 +140,18 @@

"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\": true, @@@",

+ "@@@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@@@"

]

@@ -273,11 +165,24 @@

"runhooks"

"env": {

- "GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]/goma' 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": [

@@ -296,14 +201,34 @@

"[BUILD]/goma",

"--",

"all",

- "base_unittests",

- "mojo_common_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": [

@@ -314,12 +239,12 @@

"Release",

"--xvfb",

"--factory-properties",

- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_no_bot_update\", \"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\"}",

+ "{\"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",

"--annotate=gtest",

"--test-type=telemetry_unittests",

- "--builder-name=linux_no_bot_update",

+ "--builder-name=linux_chromium_rel_swarming",

"--slave-name=TestSlavename",

"--build-number=571",

"--run-python-script",

@@ -343,12 +268,12 @@

"Release",

"--xvfb",

"--factory-properties",

"--build-properties",

"--annotate=gtest",

"--test-type=telemetry_perf_unittests",

- "--builder-name=linux_no_bot_update",

+ "--builder-name=linux_chromium_rel_swarming",

"--slave-name=TestSlavename",

"--build-number=571",

"--run-python-script",

@@ -358,6 +283,58 @@

"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",

@@ -407,30 +384,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",

- "--build-properties",

- "--annotate=gtest",

- "--test-launcher-summary-output",

- "/path/to/tmp/json",

- "--builder-name=linux_no_bot_update",

- "--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,

@@ -439,24 +407,29 @@

"cmd": [

"python",

"-u",

- "[BUILD]/scripts/slave/runtest.py",

- "--target",

- "Release",

- "--xvfb",

- "--factory-properties",

- "--build-properties",

- "--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_no_bot_update",

- "--slave-name=TestSlavename",

- "--build-number=571",

- "--parallel",

- "mojo_common_unittests"

+ "--",

+ "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": "mojo_common_unittests (with patch)"

+ "name": "[swarming] base_unittests (with patch)",

+ "~followup_annotations": [

+ "step returned non-zero exit code: 1",

+ "@@@STEP_TEXT@ failures: Test.Two @@@",

+ "@@@STEP_FAILURE@@@"

+ ]

{

"allow_subannotations": true,

@@ -465,40 +438,242 @@

"cmd": [

"python",

"-u",

- "[BUILD]/scripts/slave/runtest.py",

- "--target",

- "Release",

- "--xvfb",

- "--factory-properties",

- "--build-properties",

- "--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_no_bot_update",

- "--slave-name=TestSlavename",

- "--build-number=571",

- "--parallel",

- "browser_tests"

+ "--",

+ "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": "browser_tests (with patch)"

+ "name": "[swarming] browser_tests (with patch)"

{

+ "always_run": true,

+ "cmd": [

+ "python",

+ "-u",

+ "[DEPOT_TOOLS]/gclient.py",

+ "config",

+ "--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'}]"

+ ],

+ "name": "gclient setup (2)"

+ },

+ {

+ "abort_on_failure": true,

+ "always_run": true,

+ "cmd": [

+ "python",

+ "-u",

+ "[BUILD]/scripts/slave/gclient_safe_revert.py",

+ ".",

+ "[DEPOT_TOOLS]/gclient"

+ ],

+ "name": "gclient revert (2)"

+ },

+ {

+ "abort_on_failure": true,

+ "always_run": true,

+ "cmd": [

+ "python",

+ "-u",

+ "[DEPOT_TOOLS]/gclient.py",

+ "sync",

+ "--nohooks",

+ "--delete_unversioned_trees",

+ "--force",

+ "--verbose",

+ "--output-json",

+ "/path/to/tmp/json"

+ ],

+ "name": "gclient sync (2)",

+ "~followup_annotations": [

+ "@@@STEP_LOG_LINE@json.output@{@@@",

+ "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@",

+ "@@@STEP_LOG_LINE@json.output@ \"src/\": {@@@",

+ "@@@STEP_LOG_LINE@json.output@ \"revision\": 170242@@@",

+ "@@@STEP_LOG_LINE@json.output@ }, @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"src/native_client/\": {@@@",

+ "@@@STEP_LOG_LINE@json.output@ \"revision\": 274981@@@",

+ "@@@STEP_LOG_LINE@json.output@ }, @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"src/third_party/WebKit/\": {@@@",

+ "@@@STEP_LOG_LINE@json.output@ \"revision\": 124383@@@",

+ "@@@STEP_LOG_LINE@json.output@ }, @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc/\": {@@@",

+ "@@@STEP_LOG_LINE@json.output@ \"revision\": 120644@@@",

+ "@@@STEP_LOG_LINE@json.output@ }, @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarm_client/\": {@@@",

+ "@@@STEP_LOG_LINE@json.output@ \"revision\": 200767@@@",

+ "@@@STEP_LOG_LINE@json.output@ }, @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client/\": {@@@",

+ "@@@STEP_LOG_LINE@json.output@ \"revision\": 276089@@@",

+ "@@@STEP_LOG_LINE@json.output@ }, @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"src/v8/\": {@@@",

+ "@@@STEP_LOG_LINE@json.output@ \"revision\": 43426@@@",

+ "@@@STEP_LOG_LINE@json.output@ }@@@",

+ "@@@STEP_LOG_LINE@json.output@}@@@",

+ "@@@STEP_LOG_END@json.output@@@",

+ "@@@SET_BUILD_PROPERTY@got_nacl_revision@274981@@@",

+ "@@@SET_BUILD_PROPERTY@got_webkit_revision@124383@@@",

+ "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@276089@@@",

+ "@@@SET_BUILD_PROPERTY@got_webrtc_revision@120644@@@",

+ "@@@SET_BUILD_PROPERTY@got_revision@170242@@@",

+ "@@@SET_BUILD_PROPERTY@got_v8_revision@43426@@@",

+ "@@@SET_BUILD_PROPERTY@got_swarm_client_revision@200767@@@"

+ ]

+ },

+ {

+ "always_run": true,

+ "cmd": [

+ "python",

+ "-u",

+ "[DEPOT_TOOLS]/gclient.py",

+ "runhooks"

+ ],

+ "env": {

+ },

+ "name": "gclient runhooks (2)"

+ },

+ {

+ "abort_on_failure": false,

+ "always_run": true,

"can_fail_build": false,

"cmd": [

"python",

"-u",

- "[SLAVE_BUILD]/src/chrome/test/nacl_test_injection/buildbot_nacl_integration.py",

- "--mode",

+ "[BUILD]/scripts/slave/compile.py",

+ "--target",

"Release",

- "--json_build_results_output_file",

+ "--src-dir",

+ "[SLAVE_BUILD]/src",

+ "--build-tool",

+ "ninja",

+ "--compiler",

+ "goma",

+ "--goma-dir",

+ "[BUILD]/goma",

+ "--",

+ "base_unittests_run"

+ ],

+ "name": "compile (without patch)"

+ },

+ {

+ "abort_on_failure": true,

+ "always_run": 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": "nacl_integration (with patch)",

+ "name": "find isolated tests (2)",

"~followup_annotations": [

- "@@@STEP_LOG_LINE@json.output@[]@@@",

- "@@@STEP_LOG_END@json.output@@@"

+ "@@@STEP_LOG_LINE@json.output@{@@@",

+ "@@@STEP_LOG_LINE@json.output@ \"base_unittests\": \"[dummy hash for base_unittests]\"@@@",

+ "@@@STEP_LOG_LINE@json.output@}@@@",

+ "@@@STEP_LOG_END@json.output@@@",

+ "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"base_unittests\": \"[dummy hash for base_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 (without patch)/Linux/[dummy hash for base_unittests]/linux_chromium_rel_swarming/571",

+ "--dimension",

+ "os",

+ "Linux",

+ "[dummy hash for base_unittests]",

+ "--",

+ "--gtest_filter=Test.Two",

+ "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"

+ ],

+ "name": "[trigger] base_unittests (without patch)"

+ },

+ {

+ "allow_subannotations": true,

+ "always_run": true,

+ "can_fail_build": false,

+ "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",

+ "--shards",

+ "1",

+ "--decorate",

+ "--print-status-updates",

+ "base_unittests (without patch)/Linux/[dummy hash for base_unittests]/linux_chromium_rel_swarming/571"

+ ],

+ "name": "[swarming] base_unittests (without patch)"

+ },

+ {

+ "always_run": true,

+ "cmd": [

+ "python",

+ "-u",

+ "\nimport sys, json\nfailures = json.load(open(sys.argv[1], 'rb'))\n\nsuccess = True\n\nif failures['new']:\n success = False\n print 'New failures:'\n for f in failures['new']:\n print f\n\nif failures['ignored']:\n print 'Ignored failures:'\n for f in failures['ignored']:\n print f\n\nsys.exit(0 if success else 1)\n",

+ "{\"ignored\": [], \"new\": [\"Test.Two\"]}"

+ ],

+ "name": "base_unittests",

+ "~followup_annotations": [

+ "@@@STEP_TEXT@ failures: Test.Two @@@",

+ "@@@STEP_LOG_LINE@python.inline@@@@",

+ "@@@STEP_LOG_LINE@python.inline@import sys, json@@@",

+ "@@@STEP_LOG_LINE@python.inline@failures = json.load(open(sys.argv[1], 'rb'))@@@",

+ "@@@STEP_LOG_LINE@python.inline@@@@",

+ "@@@STEP_LOG_LINE@python.inline@success = True@@@",

+ "@@@STEP_LOG_LINE@python.inline@@@@",

+ "@@@STEP_LOG_LINE@python.inline@if failures['new']:@@@",

+ "@@@STEP_LOG_LINE@python.inline@ success = False@@@",

+ "@@@STEP_LOG_LINE@python.inline@ print 'New failures:'@@@",

+ "@@@STEP_LOG_LINE@python.inline@ for f in failures['new']:@@@",

+ "@@@STEP_LOG_LINE@python.inline@ print f@@@",

+ "@@@STEP_LOG_LINE@python.inline@@@@",

+ "@@@STEP_LOG_LINE@python.inline@if failures['ignored']:@@@",

+ "@@@STEP_LOG_LINE@python.inline@ print 'Ignored failures:'@@@",

+ "@@@STEP_LOG_LINE@python.inline@ for f in failures['ignored']:@@@",

+ "@@@STEP_LOG_LINE@python.inline@ print f@@@",

+ "@@@STEP_LOG_LINE@python.inline@@@@",

+ "@@@STEP_LOG_LINE@python.inline@sys.exit(0 if success else 1)@@@",

+ "@@@STEP_LOG_END@python.inline@@@",

+ "@@@STEP_FAILURE@@@"

]

}

]