| Index: scripts/slave/recipe_modules/chromium/example.expected/basic_no_out_dir_with_goma_module_goma_disabled_win.json
|
| diff --git a/scripts/slave/recipe_modules/chromium/example.expected/basic_no_out_dir_with_goma_module_goma_disabled_win.json b/scripts/slave/recipe_modules/chromium/example.expected/basic_no_out_dir_with_goma_module_goma_disabled_win.json
|
| index ac8752f08e12a890c00145020f8862f02fae9725..6820748dfdfed43e458d9f7d466954f614aa2277 100644
|
| --- a/scripts/slave/recipe_modules/chromium/example.expected/basic_no_out_dir_with_goma_module_goma_disabled_win.json
|
| +++ b/scripts/slave/recipe_modules/chromium/example.expected/basic_no_out_dir_with_goma_module_goma_disabled_win.json
|
| @@ -293,11 +293,27 @@
|
| "GOMA_ALLOWED_NETWORK_ERROR_DURATION": "1800",
|
| "GOMA_CACHE_DIR": "[GOMA_CACHE]",
|
| "GOMA_DEPS_CACHE_FILE": "Win_Builder.gomadeps",
|
| - "GOMA_DISABLED": "true",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| "name": "preprocess_for_goma.start_goma",
|
| "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@",
|
| + "step returned non-zero exit code: 1",
|
| + "@@@STEP_EXCEPTION@@@"
|
| + ]
|
| + },
|
| + {
|
| + "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": "preprocess_for_goma.stop_goma (start failure)",
|
| + "~followup_annotations": [
|
| "@@@STEP_NEST_LEVEL@1@@@"
|
| ]
|
| },
|
| @@ -305,17 +321,24 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "RECIPE_MODULE[build::goma]\\resources\\cloudtail_utils.py",
|
| - "start",
|
| - "--cloudtail-path",
|
| - "[CACHE]\\cipd\\goma\\cloudtail",
|
| - "--pid-file",
|
| - "[TMP_BASE]\\cloudtail.pid"
|
| + "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\upload_goma_logs.py",
|
| + "--upload-compiler-proxy-info",
|
| + "--skip-sendgomatsmon",
|
| + "--json-status",
|
| + "[CACHE]\\cipd\\goma\\jsonstatus",
|
| + "--ninja-log-exit-status",
|
| + "-1",
|
| + "--buildbot-buildername",
|
| + "Win Builder",
|
| + "--buildbot-mastername",
|
| + "chromium.win",
|
| + "--buildbot-slavename",
|
| + "build1-a1"
|
| ],
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| - "name": "preprocess_for_goma.start cloudtail",
|
| + "name": "preprocess_for_goma.upload_goma_start_failed_logs",
|
| "~followup_annotations": [
|
| "@@@STEP_NEST_LEVEL@1@@@"
|
| ]
|
| @@ -353,56 +376,6 @@
|
| "name": "compile with ninja"
|
| },
|
| {
|
| - "cmd": [],
|
| - "name": "postprocess_for_goma"
|
| - },
|
| - {
|
| - "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": "postprocess_for_goma.goma_jsonstatus",
|
| - "~followup_annotations": [
|
| - "@@@STEP_NEST_LEVEL@1@@@"
|
| - ]
|
| - },
|
| - {
|
| - "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": "postprocess_for_goma.goma_stat",
|
| - "~followup_annotations": [
|
| - "@@@STEP_NEST_LEVEL@1@@@"
|
| - ]
|
| - },
|
| - {
|
| - "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": "postprocess_for_goma.stop_goma",
|
| - "~followup_annotations": [
|
| - "@@@STEP_NEST_LEVEL@1@@@"
|
| - ]
|
| - },
|
| - {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| @@ -428,24 +401,7 @@
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| - "name": "postprocess_for_goma.upload_log",
|
| - "~followup_annotations": [
|
| - "@@@STEP_NEST_LEVEL@1@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_MODULE[build::goma]\\resources\\cloudtail_utils.py",
|
| - "stop",
|
| - "--killed-pid-file",
|
| - "[TMP_BASE]\\cloudtail.pid"
|
| - ],
|
| - "name": "postprocess_for_goma.stop cloudtail",
|
| - "~followup_annotations": [
|
| - "@@@STEP_NEST_LEVEL@1@@@"
|
| - ]
|
| + "name": "upload log goma start failed"
|
| },
|
| {
|
| "name": "$result",
|
|
|