Index: scripts/slave/recipes/swarming/staging.expected/linux_Debug.json |
diff --git a/scripts/slave/recipes/swarming/staging.expected/linux_Debug.json b/scripts/slave/recipes/swarming/staging.expected/linux_Debug.json |
index 79cf7ab087647f5a6eb3a0694bfb158a9ec082dd..4ce810375074d936c2d790cee9ef7dcdd3d768cf 100644 |
--- a/scripts/slave/recipes/swarming/staging.expected/linux_Debug.json |
+++ b/scripts/slave/recipes/swarming/staging.expected/linux_Debug.json |
@@ -13,12 +13,6 @@ |
"python", |
"-u", |
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", |
- "--master", |
- "chromium.testing.master", |
- "--builder", |
- "TestBuilder", |
- "--slave", |
- "TestSlavename", |
"--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', 'swarming_revision': '', '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'}]", |
"--root", |
@@ -41,80 +35,71 @@ |
}, |
"name": "bot_update", |
"~followup_annotations": [ |
+ "@@@STEP_TEXT@Some step text@@@", |
"@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"did_run\": false, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "RECIPE_PACKAGE[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', 'swarming_revision': '', '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'}]" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "env": { |
- "PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]" |
- }, |
- "name": "gclient setup" |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "RECIPE_PACKAGE[depot_tools]/gclient.py", |
- "sync", |
- "--nohooks", |
- "--force", |
- "--verbose", |
- "--delete_unversioned_trees", |
- "--revision", |
- "src@204787", |
- "--revision", |
- "src/tools/swarming_client@HEAD", |
- "--output-json", |
- "/path/to/tmp/json" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "env": { |
- "PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]" |
- }, |
- "name": "gclient sync", |
- "~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@ \"did_run\": true, @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"src\": \"204787\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client\": \"HEAD\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@ }, @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", |
"@@@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@ \"src/native_client\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/native_client.git\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@", |
"@@@STEP_LOG_LINE@json.output@ }, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle/\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 297276@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/angle.git\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@", |
"@@@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@ \"src/third_party/webrtc\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/webrtc.git\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"0f90628433546e61d9268596da93418c623137f4\"@@@", |
"@@@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@ \"src/tools/swarming_client\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/tools/swarming_client.git\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@", |
"@@@STEP_LOG_LINE@json.output@ }, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"src/v8/\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 43426@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"src/v8\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/v8.git\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"801ada225ddc271c132c3a35f03975671d43e399\"@@@", |
"@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
+ "@@@STEP_LOG_LINE@json.output@ }, @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@", |
+ "@@@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@@@", |
- "@@@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_angle_revision@297276@@@", |
- "@@@SET_BUILD_PROPERTY@got_v8_revision@43426@@@" |
+ "@@@SET_BUILD_PROPERTY@got_nacl_revision@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@", |
+ "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@", |
+ "@@@SET_BUILD_PROPERTY@got_webrtc_revision@\"0f90628433546e61d9268596da93418c623137f4\"@@@", |
+ "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", |
+ "@@@SET_BUILD_PROPERTY@got_nacl_revision_cp@\"refs/heads/master@{#274981}\"@@@", |
+ "@@@SET_BUILD_PROPERTY@got_angle_revision@\"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@", |
+ "@@@SET_BUILD_PROPERTY@got_v8_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@", |
+ "@@@SET_BUILD_PROPERTY@got_v8_revision_cp@\"refs/heads/master@{#43426}\"@@@", |
+ "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@", |
+ "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@", |
+ "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@", |
+ "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@" |
] |
}, |
{ |
@@ -454,7 +439,7 @@ |
"--test-results-server", |
"test-results-test.appspot.com", |
"--chrome-revision", |
- "0" |
+ "170242" |
], |
"cwd": "[SLAVE_BUILD]", |
"name": "Upload to test-results [dummy_target_1]" |
@@ -506,7 +491,7 @@ |
"--test-results-server", |
"test-results-test.appspot.com", |
"--chrome-revision", |
- "0" |
+ "170242" |
], |
"cwd": "[SLAVE_BUILD]", |
"name": "Upload to test-results [dummy_target_2]" |