Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(82)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium.expected/goma_with_diagnose_goma_failure.json

Issue 2020603002: Revert "build: remove diagnose_goma step to stop leaks" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scripts/slave/recipes/chromium.expected/full_chromium_goma_CrWinGomaStaging.json ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium.expected/goma_with_diagnose_goma_failure.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_goma_Chromium_Linux_Goma_Staging.json b/scripts/slave/recipes/chromium.expected/goma_with_diagnose_goma_failure.json
similarity index 76%
copy from scripts/slave/recipes/chromium.expected/full_chromium_goma_Chromium_Linux_Goma_Staging.json
copy to scripts/slave/recipes/chromium.expected/goma_with_diagnose_goma_failure.json
index 30be946f86c505d1dc3a66d9ce07821ea61d0c34..b24b1b84881118023ad0484609b4cf61562a5a2f 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_goma_Chromium_Linux_Goma_Staging.json
+++ b/scripts/slave/recipes/chromium.expected/goma_with_diagnose_goma_failure.json
@@ -3,11 +3,28 @@
"cmd": [
"python",
"-u",
+ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
+ "sync",
+ "--verbose",
+ "--force",
+ "--revision",
+ "build/goma@refs/heads/master"
+ ],
+ "cwd": "[BUILD]",
+ "env": {
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+ },
+ "name": "gclient update goma canary"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--master",
- "chromium.goma",
+ "chromium.fyi",
"--builder",
- "Chromium Linux Goma Staging",
+ "CrWinGoma",
"--slave",
"TestSlavename",
"--spec",
@@ -15,7 +32,7 @@
"--root",
"src",
"--revision_mapping_file",
- "{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
+ "{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
"--git-cache-dir",
"[GIT_CACHE]",
"--output_json",
@@ -25,6 +42,7 @@
"--force",
"--output_manifest"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -41,10 +59,6 @@
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/buildtools\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/buildtools.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f0319a328b2809876916353cb994259692140934\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"src/native_client\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/native_client.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
@@ -71,8 +85,6 @@
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
@@ -90,7 +102,6 @@
"@@@STEP_LOG_END@json.output@@@",
"@@@SET_BUILD_PROPERTY@got_nacl_revision@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
"@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision_cp@\"refs/heads/master@{#182578}\"@@@",
"@@@SET_BUILD_PROPERTY@got_webrtc_revision@\"0f90628433546e61d9268596da93418c623137f4\"@@@",
"@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
"@@@SET_BUILD_PROPERTY@got_nacl_revision_cp@\"refs/heads/master@{#274981}\"@@@",
@@ -100,12 +111,12 @@
"@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@",
"@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@",
"@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision@\"f0319a328b2809876916353cb994259692140934\"@@@"
+ "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@"
]
},
{
"cmd": [],
+ "cwd": "[SLAVE_BUILD]",
"name": "ensure_goma"
},
{
@@ -120,6 +131,7 @@
"--json-output",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "ensure_goma.install cipd",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
@@ -144,6 +156,7 @@
"--service-account-json",
"/creds/service_accounts/service-account-goma-client.json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "ensure_goma.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
@@ -165,11 +178,9 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
- "cwd": "[SLAVE_BUILD]/src",
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "GOMA_STUBBY_PROXY_IP_ADDRESS": "sandbox.google.com",
- "GYP_DEFINES": "component=static_library gomadir='[CACHE]/cipd/goma' target_arch=x64 use_goma=1",
+ "GYP_DEFINES": "component=static_library gomadir='[CACHE]/cipd/goma' target_arch=ia32 use_goma=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
@@ -187,8 +198,9 @@
"--paths",
"{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
"--properties",
- "{\"buildername\": \"Chromium Linux Goma Staging\", \"buildnumber\": 571, \"mastername\": \"chromium.goma\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}"
+ "{\"buildername\": \"CrWinGoma\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "get compile targets for scripts",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{}@@@",
@@ -200,12 +212,13 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/src/testing/buildbot/chromium.goma.json",
+ "[SLAVE_BUILD]/src/testing/buildbot/chromium.fyi.json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "read test spec",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.goma.json@@@",
+ "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.fyi.json@@@",
"@@@STEP_LOG_LINE@json.output@{}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
@@ -219,6 +232,7 @@
"python",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "cleanup_temp"
},
{
@@ -242,25 +256,22 @@
"--build-tool",
"ninja",
"--build-data-dir",
- "[ROOT]/build_data_dir",
+ "E:\\chrome-infra-logs",
"--compiler",
"goma",
"--goma-jsonstatus",
"/path/to/tmp/json",
- "--goma-service-account-json-file",
- "/creds/service_accounts/service-account-goma-client.json",
"--goma-dir",
"[CACHE]/cipd/goma",
- "--clobber",
+ "--goma-hermetic",
+ "error",
+ "--goma-enable-compiler-info-cache",
"--",
"base_unittests",
"chromium_builder_tests",
"content_unittests"
],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "GOMA_STUBBY_PROXY_IP_ADDRESS": "sandbox.google.com"
- },
+ "cwd": "[SLAVE_BUILD]",
"name": "compile",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
@@ -268,6 +279,19 @@
]
},
{
+ "cmd": [
+ "python",
+ "-u",
+ "[BUILD]/goma/diagnose_goma_log.py"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "diagnose_goma",
+ "~followup_annotations": [
+ "step returned non-zero exit code: 1",
+ "@@@STEP_FAILURE@@@"
+ ]
+ },
+ {
"allow_subannotations": true,
"cmd": [
"python",
@@ -277,23 +301,20 @@
"Release",
"--xvfb",
"--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Chromium Linux Goma Staging\", \"buildnumber\": 571, \"mastername\": \"chromium.goma\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"E:\\\\chrome-infra-logs\", \"buildername\": \"CrWinGoma\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
"--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Chromium Linux Goma Staging\", \"buildnumber\": 571, \"mastername\": \"chromium.goma\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"E:\\\\chrome-infra-logs\", \"buildername\": \"CrWinGoma\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"recipe\": \"chromium\", \"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",
- "--builder-name=Chromium Linux Goma Staging",
+ "--builder-name=CrWinGoma",
"--slave-name=TestSlavename",
"--build-number=571",
"base_unittests"
],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "GOMA_STUBBY_PROXY_IP_ADDRESS": "sandbox.google.com"
- },
+ "cwd": "[SLAVE_BUILD]",
"name": "base_unittests"
},
{
@@ -306,28 +327,25 @@
"Release",
"--xvfb",
"--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Chromium Linux Goma Staging\", \"buildnumber\": 571, \"mastername\": \"chromium.goma\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"E:\\\\chrome-infra-logs\", \"buildername\": \"CrWinGoma\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
"--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Chromium Linux Goma Staging\", \"buildnumber\": 571, \"mastername\": \"chromium.goma\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"E:\\\\chrome-infra-logs\", \"buildername\": \"CrWinGoma\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
"--annotate=gtest",
"--test-type=content_unittests",
"--step-name=content_unittests",
"--test-launcher-summary-output",
"/path/to/tmp/json",
- "--builder-name=Chromium Linux Goma Staging",
+ "--builder-name=CrWinGoma",
"--slave-name=TestSlavename",
"--build-number=571",
"content_unittests"
],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "GOMA_STUBBY_PROXY_IP_ADDRESS": "sandbox.google.com"
- },
+ "cwd": "[SLAVE_BUILD]",
"name": "content_unittests"
},
{
"name": "$result",
- "recipe_result": null,
- "status_code": 0
+ "reason": "1 tests failed: ['diagnose_goma']",
+ "status_code": 1
}
]
« no previous file with comments | « scripts/slave/recipes/chromium.expected/full_chromium_goma_CrWinGomaStaging.json ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698