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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1915473003: goma: back to build-provided client and disable oauth2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 4 years, 8 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_Win.json ('k') | scripts/slave/recipes/chromium.expected/full_chromium_android_Android_GN_Builder__dbg_.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium.expected/full_chromium_Win_x64.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_Win_x64.json b/scripts/slave/recipes/chromium.expected/full_chromium_Win_x64.json
index 0b23cc2caeb8a851cb16f493ff3fee7e1254b3cc..9c5f06d6d6dd87264808f287e4bd8dcf14f87fcc 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_Win_x64.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_Win_x64.json
@@ -107,63 +107,6 @@
]
},
{
- "cmd": [],
- "cwd": "[SLAVE_BUILD]",
- "name": "ensure_goma"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[build::cipd]\\resources\\bootstrap.py",
- "--platform",
- "windows-amd64",
- "--dest-directory",
- "[SLAVE_BUILD]\\cipd",
- "--json-output",
- "/path/to/tmp/json"
- ],
- "cwd": "[SLAVE_BUILD]",
- "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/windows-amd64 release",
- "--json-output",
- "/path/to/tmp/json",
- "--service-account-json",
- "C:\\creds\\service_accounts\\service-account-goma-client.json"
- ],
- "cwd": "[SLAVE_BUILD]",
- "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/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",
@@ -172,7 +115,7 @@
],
"cwd": "[SLAVE_BUILD]",
"env": {
- "GYP_DEFINES": "chromium_win_pch=0 component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' linux_dump_symbols=0 target_arch=x64 test_isolation_mode=noop use_goma=1",
+ "GYP_DEFINES": "chromium_win_pch=0 component=static_library fastbuild=1 gomadir='[BUILD]\\goma' linux_dump_symbols=0 target_arch=x64 test_isolation_mode=noop use_goma=1",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
@@ -253,10 +196,8 @@
"goma",
"--goma-jsonstatus",
"/path/to/tmp/json",
- "--goma-service-account-json-file",
- "C:\\creds\\service_accounts\\service-account-goma-client.json",
"--goma-dir",
- "[CACHE]\\cipd\\goma",
+ "[BUILD]\\goma",
"--ninja-ensure-up-to-date",
"--clobber",
"--",
@@ -277,7 +218,7 @@
"--target",
"Release",
"--factory-properties",
- "{\"gclient_env\": {\"GYP_DEFINES\": \"chromium_win_pch=0 component=static_library fastbuild=1 gomadir='[CACHE]\\\\cipd\\\\goma' linux_dump_symbols=0 target_arch=x64 test_isolation_mode=noop use_goma=1\"}, \"gs_acl\": \"public-read\", \"gs_bucket\": \"gs://chromium-browser-snapshots\"}",
+ "{\"gclient_env\": {\"GYP_DEFINES\": \"chromium_win_pch=0 component=static_library fastbuild=1 gomadir='[BUILD]\\\\goma' linux_dump_symbols=0 target_arch=x64 test_isolation_mode=noop use_goma=1\"}, \"gs_acl\": \"public-read\", \"gs_bucket\": \"gs://chromium-browser-snapshots\"}",
"--build-properties",
"{\"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": \"refs/heads/master@{#170242}\", \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"}",
"--mode",
« no previous file with comments | « scripts/slave/recipes/chromium.expected/full_chromium_Win.json ('k') | scripts/slave/recipes/chromium.expected/full_chromium_android_Android_GN_Builder__dbg_.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698