| Index: scripts/slave/recipes/chromium_libfuzzer_clang_tot.expected/full_chromium_fyi_ClangToTLinuxASanLibfuzzer.json
|
| diff --git a/scripts/slave/recipes/chromium_libfuzzer_clang_tot.expected/full_chromium_fyi_ClangToTLinuxASanLibfuzzer.json b/scripts/slave/recipes/chromium_libfuzzer_clang_tot.expected/full_chromium_fyi_ClangToTLinuxASanLibfuzzer.json
|
| index 59b55654c9254dcacb6397a1a01ab52256d0baaf..6c7ee22751b1857fe533a9efd983fa36dc8507e5 100644
|
| --- a/scripts/slave/recipes/chromium_libfuzzer_clang_tot.expected/full_chromium_fyi_ClangToTLinuxASanLibfuzzer.json
|
| +++ b/scripts/slave/recipes/chromium_libfuzzer_clang_tot.expected/full_chromium_fyi_ClangToTLinuxASanLibfuzzer.json
|
| @@ -219,48 +219,153 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
|
| - "--show-path",
|
| + "\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_ALLOWED_NETWORK_ERROR_DURATION": "1800",
|
| + "GOMA_CACHE_DIR": "[GOMA_CACHE]",
|
| + "GOMA_DEPS_CACHE_FILE": "ClangToTLinuxASanLibfuzzer.gomadeps",
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| + "LLVM_FORCE_HEAD_REVISION": "YES"
|
| + },
|
| + "name": "start_goma"
|
| + },
|
| + {
|
| + "cmd": [
|
| "python",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py",
|
| - "--gsutil-py-path",
|
| - "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
|
| - "--ninja-path",
|
| + "-u",
|
| + "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
|
| + "start",
|
| + "--cloudtail-path",
|
| + "[CACHE]/cipd/goma/cloudtail",
|
| + "--pid-file",
|
| + "[TMP_BASE]/cloudtail.pid"
|
| + ],
|
| + "env": {
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| + },
|
| + "name": "start cloudtail"
|
| + },
|
| + {
|
| + "cmd": [
|
| "RECIPE_PACKAGE_REPO[depot_tools]/ninja",
|
| - "--target",
|
| - "Release",
|
| - "--src-dir",
|
| - "[SLAVE_BUILD]/src",
|
| - "--goma-cache-dir",
|
| - "[GOMA_CACHE]",
|
| + "-w",
|
| + "dupbuild=err",
|
| + "-C",
|
| + "[SLAVE_BUILD]/src/out/Release",
|
| + "-j",
|
| + "50",
|
| + "empty_fuzzer"
|
| + ],
|
| + "env": {
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| + "LLVM_FORCE_HEAD_REVISION": "YES"
|
| + },
|
| + "name": "compile with ninja"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "[CACHE]/cipd/goma/goma_ctl.py",
|
| + "jsonstatus",
|
| + "[CACHE]/cipd/goma/jsonstatus"
|
| + ],
|
| + "env": {
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/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": "/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": "/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]/src/out/Release",
|
| + "--ninja-log-compiler",
|
| + "goma-clang",
|
| + "--ninja-log-command",
|
| + "['RECIPE_PACKAGE_REPO[depot_tools]/ninja', '-w', 'dupbuild=err', '-C', '[SLAVE_BUILD]/src/out/Release', '-j', 50, 'empty_fuzzer']",
|
| + "--ninja-log-exit-status",
|
| + "0",
|
| "--buildbot-buildername",
|
| "ClangToTLinuxASanLibfuzzer",
|
| "--buildbot-mastername",
|
| "chromium.fyi",
|
| "--buildbot-slavename",
|
| - "TestSlavename",
|
| - "--goma-deps-cache-file",
|
| - "ClangToTLinuxASanLibfuzzer.gomadeps",
|
| - "--compiler",
|
| - "goma-clang",
|
| - "--goma-jsonstatus",
|
| - "/path/to/tmp/json",
|
| - "--goma-service-account-json-file",
|
| - "/creds/service_accounts/service-account-goma-client.json",
|
| - "--goma-dir",
|
| - "[CACHE]/cipd/goma",
|
| - "--",
|
| - "empty_fuzzer"
|
| + "TestSlavename"
|
| ],
|
| "env": {
|
| - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "LLVM_FORCE_HEAD_REVISION": "YES"
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| - "name": "compile",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
|
| - "@@@STEP_LOG_END@json.output (invalid)@@@"
|
| - ]
|
| + "name": "upload_log"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
|
| + "stop",
|
| + "--killed-pid-file",
|
| + "[TMP_BASE]/cloudtail.pid"
|
| + ],
|
| + "name": "stop cloudtail"
|
| },
|
| {
|
| "cmd": [
|
|
|