Index: scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64_pass.json |
diff --git a/scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64_pass.json b/scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64_pass.json |
index 2649e1cf96ccec4f6051dddcb56956c9c5948f8b..868b0ea2fba58aa7a48af7b533341fb7d9a8bd60 100644 |
--- a/scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64_pass.json |
+++ b/scripts/slave/recipes/blink_downstream.expected/full_client_v8_fyi_V8_Blink_Linux_64_pass.json |
@@ -3,6 +3,28 @@ |
"cmd": [ |
"python", |
"-u", |
+ "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", |
+ "[BUILDER_CACHE]/V8_Blink_Linux_64", |
+ "511" |
+ ], |
+ "name": "makedirs checkout path", |
+ "~followup_annotations": [ |
+ "@@@STEP_LOG_LINE@python.inline@@@@", |
+ "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", |
+ "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", |
+ "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", |
+ "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", |
+ "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", |
+ "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", |
+ "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", |
+ "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", |
+ "@@@STEP_LOG_END@python.inline@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", |
"--master", |
"client.v8.fyi", |
@@ -27,6 +49,7 @@ |
"--force", |
"--output_manifest" |
], |
+ "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -108,17 +131,74 @@ |
] |
}, |
{ |
+ "cmd": [], |
+ "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64", |
+ "name": "ensure_goma" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "RECIPE_MODULE[build::cipd]/resources/bootstrap.py", |
+ "--platform", |
+ "linux-amd64", |
+ "--dest-directory", |
+ "[SLAVE_BUILD]/cipd", |
+ "--json-output", |
+ "/path/to/tmp/json" |
+ ], |
+ "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64", |
+ "name": "ensure_goma.install cipd", |
+ "~followup_annotations": [ |
+ "@@@STEP_NEST_LEVEL@1@@@", |
+ "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", |
+ "@@@STEP_LOG_LINE@json.output@{@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@}@@@", |
+ "@@@STEP_LOG_END@json.output@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "[SLAVE_BUILD]/cipd/cipd", |
+ "ensure", |
+ "--root", |
+ "[CACHE]/cipd/goma", |
+ "--list", |
+ "infra_internal/goma/client/linux-amd64 release", |
+ "--json-output", |
+ "/path/to/tmp/json", |
+ "--service-account-json", |
+ "/creds/service_accounts/service-account-goma-client.json" |
+ ], |
+ "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64", |
+ "name": "ensure_goma.ensure_installed", |
+ "~followup_annotations": [ |
+ "@@@STEP_NEST_LEVEL@1@@@", |
+ "@@@STEP_LOG_LINE@json.output@{@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@", |
+ "@@@STEP_LOG_LINE@json.output@ {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/linux-amd64\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@ }@@@", |
+ "@@@STEP_LOG_LINE@json.output@ ]@@@", |
+ "@@@STEP_LOG_LINE@json.output@}@@@", |
+ "@@@STEP_LOG_END@json.output@@@" |
+ ] |
+ }, |
+ { |
"cmd": [ |
"python", |
"-u", |
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", |
"runhooks" |
], |
- "cwd": "[SLAVE_BUILD]/src", |
+ "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
"GYP_CHROMIUM_NO_ACTION": "1", |
- "GYP_DEFINES": "component=static_library gomadir='[BUILD]/goma' target_arch=x64 use_goma=1", |
+ "GYP_DEFINES": "component=static_library gomadir='[CACHE]/cipd/goma' target_arch=x64 use_goma=1", |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
"name": "gclient runhooks" |
@@ -127,19 +207,19 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/tools/mb/mb.py", |
+ "[BUILDER_CACHE]/V8_Blink_Linux_64/src/tools/mb/mb.py", |
"gen", |
"-m", |
"client.v8.fyi", |
"-b", |
"V8-Blink Linux 64", |
"--config-file", |
- "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl", |
+ "[BUILDER_CACHE]/V8_Blink_Linux_64/src/tools/mb/mb_config.pyl", |
"--goma-dir", |
- "[BUILD]/goma", |
+ "[CACHE]/cipd/goma", |
"//out/Release" |
], |
- "cwd": "[SLAVE_BUILD]/src", |
+ "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
}, |
@@ -160,9 +240,11 @@ |
"--target", |
"Release", |
"--src-dir", |
- "[SLAVE_BUILD]/src", |
+ "[BUILDER_CACHE]/V8_Blink_Linux_64/src", |
"--goma-cache-dir", |
"[GOMA_CACHE]", |
+ "--goma-deps-cache-dir", |
+ "[GOMA_DEPS_CACHE]", |
"--compiler", |
"goma", |
"--goma-jsonstatus", |
@@ -170,10 +252,11 @@ |
"--goma-service-account-json-file", |
"/creds/service_accounts/service-account-goma-client.json", |
"--goma-dir", |
- "[BUILD]/goma", |
+ "[CACHE]/cipd/goma", |
"--", |
"blink_tests" |
], |
+ "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
}, |
@@ -192,15 +275,16 @@ |
"Release", |
"--xvfb", |
"--factory-properties", |
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"V8-Blink Linux 64\", \"buildnumber\": 571, \"mastername\": \"client.v8.fyi\", \"recipe\": \"blink_downstream\", \"revision\": \"20123\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"V8-Blink Linux 64\", \"buildnumber\": 571, \"mastername\": \"client.v8.fyi\", \"path_config\": \"kitchen\", \"recipe\": \"blink_downstream\", \"revision\": \"20123\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
"--build-properties", |
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"V8-Blink Linux 64\", \"buildnumber\": 571, \"mastername\": \"client.v8.fyi\", \"recipe\": \"blink_downstream\", \"revision\": \"20123\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"V8-Blink Linux 64\", \"buildnumber\": 571, \"mastername\": \"client.v8.fyi\", \"path_config\": \"kitchen\", \"recipe\": \"blink_downstream\", \"revision\": \"20123\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
"--step-name=webkit_unit_tests", |
"--builder-name=V8-Blink Linux 64", |
"--slave-name=TestSlavename", |
"--build-number=571", |
"webkit_unit_tests" |
], |
+ "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64", |
"name": "webkit_unit_tests" |
}, |
{ |
@@ -212,9 +296,9 @@ |
"Release", |
"--no-xvfb", |
"--factory-properties", |
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"V8-Blink Linux 64\", \"buildnumber\": 571, \"mastername\": \"client.v8.fyi\", \"recipe\": \"blink_downstream\", \"revision\": \"20123\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"V8-Blink Linux 64\", \"buildnumber\": 571, \"mastername\": \"client.v8.fyi\", \"path_config\": \"kitchen\", \"recipe\": \"blink_downstream\", \"revision\": \"20123\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
"--build-properties", |
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"V8-Blink Linux 64\", \"buildnumber\": 571, \"mastername\": \"client.v8.fyi\", \"recipe\": \"blink_downstream\", \"revision\": \"20123\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"V8-Blink Linux 64\", \"buildnumber\": 571, \"mastername\": \"client.v8.fyi\", \"path_config\": \"kitchen\", \"recipe\": \"blink_downstream\", \"revision\": \"20123\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
"--step-name=webkit_tests (with patch)", |
"--builder-name=V8-Blink Linux 64", |
"--slave-name=TestSlavename", |
@@ -226,7 +310,7 @@ |
"-o", |
"[SLAVE_BUILD]/layout-test-results", |
"--build-dir", |
- "[SLAVE_BUILD]/src/out", |
+ "[BUILDER_CACHE]/V8_Blink_Linux_64/src/out", |
"--json-test-results", |
"/path/to/tmp/json", |
"--test-results-server", |
@@ -239,8 +323,9 @@ |
"webkit_tests (with patch)", |
"--no-pixel-tests", |
"--additional-expectations", |
- "[SLAVE_BUILD]/src/v8/tools/blink_tests/TestExpectations" |
+ "[BUILDER_CACHE]/V8_Blink_Linux_64/src/v8/tools/blink_tests/TestExpectations" |
], |
+ "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64", |
"name": "webkit_tests (with patch)", |
"~followup_annotations": [ |
"@@@STEP_TEXT@<br/>Total executed: 9001<br/>@@@" |
@@ -254,7 +339,7 @@ |
"--results-dir", |
"[SLAVE_BUILD]/layout-test-results", |
"--build-dir", |
- "[SLAVE_BUILD]/src/out", |
+ "[BUILDER_CACHE]/V8_Blink_Linux_64/src/out", |
"--build-number", |
"571", |
"--builder-name", |
@@ -264,6 +349,7 @@ |
"--staging-dir", |
"[CACHE]/chrome_staging" |
], |
+ "cwd": "[BUILDER_CACHE]/V8_Blink_Linux_64", |
"name": "archive_webkit_tests_results", |
"~followup_annotations": [ |
"@@@STEP_LINK@layout_test_results@https://storage.googleapis.com/chromium-layout-test-archives/V8-Blink_Linux_64/571/layout-test-results/results.html@@@", |