Index: scripts/slave/recipes/chromium.expected/full_client_v8_fyi_V8_Linux_GN.json |
diff --git a/scripts/slave/recipes/chromium_gn.expected/full_client_v8_fyi_V8_Linux_GN.json b/scripts/slave/recipes/chromium.expected/full_client_v8_fyi_V8_Linux_GN.json |
similarity index 83% |
rename from scripts/slave/recipes/chromium_gn.expected/full_client_v8_fyi_V8_Linux_GN.json |
rename to scripts/slave/recipes/chromium.expected/full_client_v8_fyi_V8_Linux_GN.json |
index 37602c3f4fdc029ec0eaa2fda6ab5dbca30e330e..b9c7b4b418d2d6a8aa2a579dee1dd4e226565126 100644 |
--- a/scripts/slave/recipes/chromium_gn.expected/full_client_v8_fyi_V8_Linux_GN.json |
+++ b/scripts/slave/recipes/chromium.expected/full_client_v8_fyi_V8_Linux_GN.json |
@@ -23,7 +23,7 @@ |
"--revision", |
"src@origin/lkcr", |
"--revision", |
- "src/v8@HEAD", |
+ "src/v8@22135", |
"--force", |
"--output_manifest" |
], |
@@ -38,7 +38,7 @@ |
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@", |
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", |
"@@@STEP_LOG_LINE@json.output@ \"src\": \"origin/lkcr\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"src/v8\": \"HEAD\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"src/v8\": \"22135\"@@@", |
"@@@STEP_LOG_LINE@json.output@ }, @@@", |
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", |
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", |
@@ -104,38 +104,29 @@ |
"cmd": [ |
"python", |
"-u", |
- "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
- "runhooks" |
+ "RECIPE_MODULE[build::goma]/resources/ensure_goma.py", |
+ "--target-dir", |
+ "[SLAVE_BUILD]/src/build/goma/client", |
+ "--download-from-google-storage-path", |
+ "RECIPE_PACKAGE_REPO[depot_tools]/download_from_google_storage.py" |
], |
"cwd": "[SLAVE_BUILD]", |
- "env": { |
- "GYP_CHROMIUM_NO_ACTION": "1", |
- "GYP_DEFINES": "component=static_library gomadir='[BUILD]/goma' target_arch=x64 use_goma=1", |
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
- }, |
- "name": "gclient runhooks" |
+ "name": "ensure_goma" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "[SLAVE_BUILD]/src/testing/buildbot/client.v8.fyi.json", |
- "/path/to/tmp/json" |
+ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
+ "runhooks" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "read test spec", |
- "~followup_annotations": [ |
- "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/client.v8.fyi.json@@@", |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"V8 Linux GN\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"base_unittests\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ ]@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
+ "env": { |
+ "GYP_CHROMIUM_NO_ACTION": "1", |
+ "GYP_DEFINES": "component=static_library gomadir='[SLAVE_BUILD]/src/build/goma/client' target_arch=x64 use_goma=1", |
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
+ }, |
+ "name": "gclient runhooks" |
}, |
{ |
"cmd": [ |
@@ -163,6 +154,34 @@ |
"cmd": [ |
"python", |
"-u", |
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
+ "[SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json", |
+ "/path/to/tmp/json" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "read test spec", |
+ "~followup_annotations": [ |
+ "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@", |
+ "@@@STEP_LOG_LINE@json.output@{}@@@", |
+ "@@@STEP_LOG_END@json.output@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", |
+ "--show-path", |
+ "python", |
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "cleanup_temp" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
"[SLAVE_BUILD]/src/tools/mb/mb.py", |
"gen", |
"-m", |
@@ -172,7 +191,7 @@ |
"--config-file", |
"[SLAVE_BUILD]/src/tools/mb/mb_config.pyl", |
"--goma-dir", |
- "[BUILD]/goma", |
+ "[SLAVE_BUILD]/src/build/goma/client", |
"//out/Release" |
], |
"cwd": "[SLAVE_BUILD]", |
@@ -201,10 +220,11 @@ |
"--goma-jsonstatus", |
"/path/to/tmp/json", |
"--goma-dir", |
- "[BUILD]/goma", |
+ "[SLAVE_BUILD]/src/build/goma/client", |
+ "--ninja-ensure-up-to-date", |
"--", |
- "base_unittests", |
- "all" |
+ "All", |
+ "chromium_builder_tests" |
], |
"cwd": "[SLAVE_BUILD]", |
"name": "compile", |
@@ -218,29 +238,23 @@ |
"cmd": [ |
"python", |
"-u", |
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py", |
+ "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", |
+ "--show-path", |
+ "python", |
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/zip_build.py", |
"--target", |
"Release", |
- "--xvfb", |
+ "--build-url", |
+ "gs://chromium-v8/client.v8.fyi/V8 Linux GN", |
+ "--build_revision", |
+ "801ada225ddc271c132c3a35f03975671d43e399", |
"--factory-properties", |
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"V8 Linux GN\", \"buildnumber\": 571, \"mastername\": \"client.v8.fyi\", \"recipe\": \"chromium_gn\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"V8 Linux GN\", \"buildnumber\": 571, \"mastername\": \"client.v8.fyi\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"revision\": \"22135\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
"--build-properties", |
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"V8 Linux GN\", \"buildnumber\": 571, \"mastername\": \"client.v8.fyi\", \"recipe\": \"chromium_gn\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
- "--annotate=gtest", |
- "--test-type=base_unittests", |
- "--step-name=base_unittests", |
- "--test-launcher-summary-output", |
- "/path/to/tmp/json", |
- "--generate-json-file", |
- "-o", |
- "gtest-results/base_unittests", |
- "--builder-name=V8 Linux GN", |
- "--slave-name=TestSlavename", |
- "--build-number=571", |
- "base_unittests" |
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"V8 Linux GN\", \"buildnumber\": 571, \"mastername\": \"client.v8.fyi\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"revision\": \"22135\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}" |
], |
"cwd": "[SLAVE_BUILD]", |
- "name": "base_unittests" |
+ "name": "package build" |
}, |
{ |
"name": "$result", |