Chromium Code Reviews| Index: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_v8_v8_linux_chromium_gn_rel.json |
| diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_chromium_dbg_ng.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_v8_v8_linux_chromium_gn_rel.json |
| similarity index 84% |
| copy from scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_chromium_dbg_ng.json |
| copy to scripts/slave/recipes/chromium_trybot.expected/full_tryserver_v8_v8_linux_chromium_gn_rel.json |
| index 1e59ea24fadf91504e9310f2ec3ccd6a912acee3..fac5072af2a50c231374173235a3ea25ece58baf 100644 |
| --- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_chromium_dbg_ng.json |
| +++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_v8_v8_linux_chromium_gn_rel.json |
| @@ -5,17 +5,17 @@ |
| "-u", |
| "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", |
| "--master", |
| - "tryserver.chromium.linux", |
| + "tryserver.v8", |
| "--builder", |
| - "linux_chromium_dbg_ng", |
| + "v8_linux_chromium_gn_rel", |
| "--slave", |
| "TestSlavename", |
| "--spec", |
| - "cache_dir = '[GIT_CACHE]'\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'}]", |
| + "cache_dir = '[GIT_CACHE]'\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', 'v8_branch': 'branches/bleeding_edge', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'safesync_url': 'https://build.chromium.org/p/chromium/lkcr-status/lkgr', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]", |
| "--root", |
| "src", |
| "--revision_mapping_file", |
| - "{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}", |
| + "{\"src\": \"got_cr_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_revision\"}", |
| "--git-cache-dir", |
| "[GIT_CACHE]", |
| "--issue", |
| @@ -27,7 +27,9 @@ |
| "--output_json", |
| "/path/to/tmp/json", |
| "--revision", |
| - "src@HEAD", |
| + "src@origin/lkcr", |
| + "--revision", |
| + "src/v8@HEAD", |
|
Michael Achenbach
2016/03/21 09:19:36
Also this looks correct. I might add a test case t
Dirk Pranke
2016/03/21 19:21:07
Okay, I can take a stab at that.
|
| "--output_manifest" |
| ], |
| "cwd": "[SLAVE_BUILD]", |
| @@ -40,7 +42,8 @@ |
| "@@@STEP_LOG_LINE@json.output@{@@@", |
| "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@", |
| "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", |
| - "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@", |
| + "@@@STEP_LOG_LINE@json.output@ \"src\": \"origin/lkcr\", @@@", |
| + "@@@STEP_LOG_LINE@json.output@ \"src/v8\": \"HEAD\"@@@", |
| "@@@STEP_LOG_LINE@json.output@ }, @@@", |
| "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", |
| "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", |
| @@ -73,14 +76,14 @@ |
| "@@@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_cr_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", |
| + "@@@STEP_LOG_LINE@json.output@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", |
| "@@@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_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@", |
| + "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#43426}\", @@@", |
| "@@@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@ }, @@@", |
| @@ -88,17 +91,17 @@ |
| "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@", |
| "@@@STEP_LOG_LINE@json.output@}@@@", |
| "@@@STEP_LOG_END@json.output@@@", |
| + "@@@SET_BUILD_PROPERTY@got_cr_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", |
| "@@@SET_BUILD_PROPERTY@got_nacl_revision@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@", |
| + "@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@", |
| "@@@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_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@", |
| "@@@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_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}\"@@@" |
| ] |
| }, |
| @@ -119,27 +122,13 @@ |
| "cmd": [ |
| "python", |
| "-u", |
| - "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py", |
| - "--version" |
| - ], |
| - "cwd": "[SLAVE_BUILD]", |
| - "name": "swarming.py --version", |
| - "stdout": "/path/to/tmp/", |
| - "~followup_annotations": [ |
| - "@@@STEP_TEXT@0.4.10@@@" |
| - ] |
| - }, |
| - { |
| - "cmd": [ |
| - "python", |
| - "-u", |
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
| "runhooks" |
| ], |
| "cwd": "[SLAVE_BUILD]", |
| "env": { |
| "GYP_CHROMIUM_NO_ACTION": "1", |
| - "GYP_DEFINES": "component=shared_library dcheck_always_on=1 fastbuild=1 gomadir='[SLAVE_BUILD]/src/build/goma/client' target_arch=x64 test_isolation_mode=prepare use_goma=1", |
| + "GYP_DEFINES": "component=shared_library dcheck_always_on=1 fastbuild=1 gomadir='[SLAVE_BUILD]/src/build/goma/client' target_arch=x64 use_goma=1", |
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
| }, |
| "name": "gclient runhooks (with patch)" |
| @@ -154,11 +143,10 @@ |
| "--", |
| "--build-config-fs", |
| "Debug", |
| - "--use-src-side-runtest-py", |
| "--paths", |
| "{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}", |
| "--properties", |
| - "{\"buildername\": \"linux_chromium_dbg_ng\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.linux\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}" |
| + "{\"buildername\": \"v8_linux_chromium_gn_rel\", \"buildnumber\": 571, \"mastername\": \"tryserver.v8\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}" |
| ], |
| "cwd": "[SLAVE_BUILD]", |
| "name": "get compile targets for scripts", |