Index: scripts/slave/recipes/blink_trybot.expected/full_tryserver_blink_linux_blink_no_bot_update_pass.json |
diff --git a/scripts/slave/recipes/blink_trybot.expected/full_tryserver_blink_linux_blink_no_bot_update_pass.json b/scripts/slave/recipes/blink_trybot.expected/full_tryserver_blink_linux_blink_no_bot_update_pass.json |
index 64b6b789842c2b5ef20cb541a9719402e2c48e7e..34bb2f3e6e70f0e94e293f18f5b05fd7e08a435f 100644 |
--- a/scripts/slave/recipes/blink_trybot.expected/full_tryserver_blink_linux_blink_no_bot_update_pass.json |
+++ b/scripts/slave/recipes/blink_trybot.expected/full_tryserver_blink_linux_blink_no_bot_update_pass.json |
@@ -25,83 +25,33 @@ |
"--revision", |
"src@HEAD", |
"--revision", |
- "src/third_party/WebKit@HEAD" |
- ], |
- "name": "bot_update", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"did_run\": false@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
- "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'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/page_cycler': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]" |
- ], |
- "name": "gclient setup" |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "[BUILD]/scripts/slave/gclient_safe_revert.py", |
- ".", |
- "[DEPOT_TOOLS]/gclient" |
- ], |
- "name": "gclient revert" |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "[DEPOT_TOOLS]/gclient.py", |
- "sync", |
- "--nohooks", |
- "--delete_unversioned_trees", |
- "--force", |
- "--verbose", |
- "--revision", |
- "src@HEAD", |
- "--revision", |
"src/third_party/WebKit@HEAD", |
- "--output-json", |
- "/path/to/tmp/json" |
+ "--force" |
], |
- "name": "gclient sync", |
+ "name": "bot_update", |
"~followup_annotations": [ |
+ "@@@STEP_TEXT@Some step text@@@", |
"@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"src-internal/\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 274229@@@", |
- "@@@STEP_LOG_LINE@json.output@ }, @@@", |
- "@@@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_LINE@json.output@ \"did_run\": true, @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src/third_party/WebKit\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": 274981, @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_git\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": 170242, @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision_git\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"got_swarm_client_revision\": 200767, @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"got_swarm_client_revision_git\": \"932d037f462c12db1f3210de8ea1b2964f363f47\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": 276089, @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_git\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": 43426, @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_git\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"got_webkit_revision\": 124383, @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"got_webkit_revision_git\": \"5e2293dffc3cd07d37fbedea3b500f0eb650614d\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision\": 120644, @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision_git\": \"0f90628433546e61d9268596da93418c623137f4\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@ }, @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@", |
"@@@STEP_LOG_LINE@json.output@}@@@", |
"@@@STEP_LOG_END@json.output@@@", |
"@@@SET_BUILD_PROPERTY@got_nacl_revision@274981@@@", |
@@ -109,31 +59,21 @@ |
"@@@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_swarm_client_revision_git@\"932d037f462c12db1f3210de8ea1b2964f363f47\"@@@", |
"@@@SET_BUILD_PROPERTY@got_v8_revision@43426@@@", |
- "@@@SET_BUILD_PROPERTY@got_swarm_client_revision@200767@@@" |
+ "@@@SET_BUILD_PROPERTY@got_nacl_revision_git@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@", |
+ "@@@SET_BUILD_PROPERTY@got_webkit_revision_git@\"5e2293dffc3cd07d37fbedea3b500f0eb650614d\"@@@", |
+ "@@@SET_BUILD_PROPERTY@got_webrtc_revision_git@\"0f90628433546e61d9268596da93418c623137f4\"@@@", |
+ "@@@SET_BUILD_PROPERTY@got_v8_revision_git@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@", |
+ "@@@SET_BUILD_PROPERTY@got_swarm_client_revision@200767@@@", |
+ "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_git@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@", |
+ "@@@SET_BUILD_PROPERTY@got_revision_git@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@" |
] |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[DEPOT_TOOLS]/apply_issue.py", |
- "-r", |
- "[SLAVE_BUILD]/src/third_party/WebKit", |
- "-i", |
- "12853011", |
- "-p", |
- "1", |
- "-s", |
- "https://codereview.chromium.org", |
- "--no-auth" |
- ], |
- "name": "apply_issue" |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
"[DEPOT_TOOLS]/gclient.py", |
"runhooks" |
], |