Index: scripts/slave/recipes/pdfium.expected/win.json |
diff --git a/scripts/slave/recipes/pdfium.expected/win.json b/scripts/slave/recipes/pdfium.expected/win.json |
index decee50fbc85607f65b4b0caf62ef13e2fe746a1..e2b70db40c28eeea4105268df922e70a25c981be 100644 |
--- a/scripts/slave/recipes/pdfium.expected/win.json |
+++ b/scripts/slave/recipes/pdfium.expected/win.json |
@@ -53,64 +53,6 @@ |
"name": "gclient runhooks" |
}, |
{ |
- "cmd": [], |
- "name": "ensure_goma" |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "RECIPE_MODULE[depot_tools::cipd]\\resources\\bootstrap.py", |
- "--platform", |
- "windows-amd64", |
- "--dest-directory", |
- "[SLAVE_BUILD]\\cipd", |
- "--json-output", |
- "/path/to/tmp/json" |
- ], |
- "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/tools/cloudtail/windows-amd64 goma_recipe_module\ninfra_internal/goma/client/windows-amd64 release", |
- "--json-output", |
- "/path/to/tmp/json", |
- "--service-account-json", |
- "C:\\creds\\service_accounts\\service-account-goma-client.json" |
- ], |
- "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-goma_recipe_modu\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/windows-amd64\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }, @@@", |
- "@@@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/windows-amd64\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@ ]@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
"cmd": [ |
"python", |
"-u", |
@@ -118,150 +60,18 @@ |
"--root=[SLAVE_BUILD]\\pdfium", |
"gen", |
"//out/debug_v8", |
- "--args=is_debug=true is_component_build=false pdf_enable_v8=true pdf_enable_xfa=false pdf_use_skia=false pdf_is_standalone=true use_goma=true goma_dir=\"[CACHE]\\cipd\\goma\" symbol_level=1" |
+ "--args=is_debug=true is_component_build=false pdf_enable_v8=true pdf_enable_xfa=false pdf_use_skia=false pdf_is_standalone=true symbol_level=1" |
], |
"cwd": "[SLAVE_BUILD]\\pdfium", |
"name": "gn gen" |
}, |
{ |
"cmd": [ |
- "python", |
- "-u", |
- "\nimport multiprocessing\nimport sys\n\njob_limit = 200\nif sys.platform.startswith('linux'):\n # Use 80 for linux not to load goma backend.\n job_limit = 80\n\ntry:\n jobs = min(job_limit, multiprocessing.cpu_count() * 10)\nexcept NotImplementedError:\n jobs = 50\n\nprint jobs\n" |
- ], |
- "name": "calculate the number of recommended jobs", |
- "stdout": "/path/to/tmp/", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@python.inline@@@@", |
- "@@@STEP_LOG_LINE@python.inline@import multiprocessing@@@", |
- "@@@STEP_LOG_LINE@python.inline@import sys@@@", |
- "@@@STEP_LOG_LINE@python.inline@@@@", |
- "@@@STEP_LOG_LINE@python.inline@job_limit = 200@@@", |
- "@@@STEP_LOG_LINE@python.inline@if sys.platform.startswith('linux'):@@@", |
- "@@@STEP_LOG_LINE@python.inline@ # Use 80 for linux not to load goma backend.@@@", |
- "@@@STEP_LOG_LINE@python.inline@ job_limit = 80@@@", |
- "@@@STEP_LOG_LINE@python.inline@@@@", |
- "@@@STEP_LOG_LINE@python.inline@try:@@@", |
- "@@@STEP_LOG_LINE@python.inline@ jobs = min(job_limit, multiprocessing.cpu_count() * 10)@@@", |
- "@@@STEP_LOG_LINE@python.inline@except NotImplementedError:@@@", |
- "@@@STEP_LOG_LINE@python.inline@ jobs = 50@@@", |
- "@@@STEP_LOG_LINE@python.inline@@@@", |
- "@@@STEP_LOG_LINE@python.inline@print jobs@@@", |
- "@@@STEP_LOG_END@python.inline@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "[CACHE]\\cipd\\goma\\goma_ctl.py", |
- "restart" |
- ], |
- "env": { |
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json" |
- }, |
- "name": "start_goma" |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "RECIPE_MODULE[build::goma]\\resources\\cloudtail_utils.py", |
- "start", |
- "--cloudtail-path", |
- "[CACHE]\\cipd\\goma\\cloudtail" |
- ], |
- "env": { |
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json" |
- }, |
- "name": "start cloudtail", |
- "stdout": "/path/to/tmp/" |
- }, |
- { |
- "cmd": [ |
"ninja", |
"-C", |
- "[SLAVE_BUILD]\\pdfium\\out\\debug_v8", |
- "-j", |
- "50" |
+ "[SLAVE_BUILD]\\pdfium\\out\\debug_v8" |
], |
"name": "compile with ninja" |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "[CACHE]\\cipd\\goma\\goma_ctl.py", |
- "jsonstatus", |
- "[CACHE]\\cipd\\goma\\jsonstatus" |
- ], |
- "env": { |
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json" |
- }, |
- "name": "goma_jsonstatus" |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "[CACHE]\\cipd\\goma\\goma_ctl.py", |
- "stat" |
- ], |
- "env": { |
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json" |
- }, |
- "name": "goma_stat" |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "[CACHE]\\cipd\\goma\\goma_ctl.py", |
- "stop" |
- ], |
- "env": { |
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json" |
- }, |
- "name": "stop_goma" |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\upload_goma_logs.py", |
- "--upload-compiler-proxy-info", |
- "--json-status", |
- "[CACHE]\\cipd\\goma\\jsonstatus", |
- "--ninja-log-outdir", |
- "[SLAVE_BUILD]\\pdfium\\out\\debug_v8", |
- "--ninja-log-compiler", |
- "unknown", |
- "--ninja-log-command", |
- "['ninja', '-C', Path('checkout', 'out','debug_v8'), '-j', 50]", |
- "--ninja-log-exit-status", |
- "0", |
- "--buildbot-buildername", |
- "windows", |
- "--buildbot-mastername", |
- "client.pdfium", |
- "--buildbot-slavename", |
- "test_slave" |
- ], |
- "env": { |
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json" |
- }, |
- "name": "upload_log" |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "RECIPE_MODULE[build::goma]\\resources\\cloudtail_utils.py", |
- "stop", |
- "--killed-pid", |
- "12345" |
- ], |
- "name": "stop cloudtail" |
}, |
{ |
"cmd": [ |
@@ -315,4 +125,4 @@ |
"recipe_result": null, |
"status_code": 0 |
} |
-] |
+] |