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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/findit/chromium/test.expected/only_one_test_passed.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/findit/chromium/test.expected/nonexistent_test_step_skipped.json ('k') | scripts/slave/recipes/findit/chromium/test.expected/swarming_tests.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/findit/chromium/test.expected/only_one_test_passed.json
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/only_one_test_passed.json b/scripts/slave/recipes/findit/chromium/test.expected/only_one_test_passed.json
index b6583125af4e01e437de385db42611fbba956472..ba240abe7ab871619f2aa3c9abaa83261c08a9cf 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/only_one_test_passed.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/only_one_test_passed.json
@@ -106,63 +106,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",
@@ -186,7 +129,7 @@
"cwd": "[SLAVE_BUILD]",
"env": {
"GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "archive_gpu_tests=1 chromium_win_pch=0 component=static_library fastbuild=1 ffmpeg_branding=Chrome gomadir='[CACHE]\\cipd\\goma' proprietary_codecs=1 target_arch=ia32 test_isolation_mode=prepare use_goma=1",
+ "GYP_DEFINES": "archive_gpu_tests=1 chromium_win_pch=0 component=static_library fastbuild=1 ffmpeg_branding=Chrome gomadir='[BUILD]\\goma' proprietary_codecs=1 target_arch=ia32 test_isolation_mode=prepare use_goma=1",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
@@ -368,66 +311,6 @@
]
},
{
- "cmd": [],
- "cwd": "[SLAVE_BUILD]",
- "name": "test r1.ensure_goma",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "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": "test r1.ensure_goma.install cipd",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@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": "test r1.ensure_goma.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@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",
@@ -437,7 +320,7 @@
"cwd": "[SLAVE_BUILD]",
"env": {
"GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "archive_gpu_tests=1 chromium_win_pch=0 component=static_library fastbuild=1 ffmpeg_branding=Chrome gomadir='[CACHE]\\cipd\\goma' proprietary_codecs=1 target_arch=ia32 test_isolation_mode=prepare use_goma=1",
+ "GYP_DEFINES": "archive_gpu_tests=1 chromium_win_pch=0 component=static_library fastbuild=1 ffmpeg_branding=Chrome gomadir='[BUILD]\\goma' proprietary_codecs=1 target_arch=ia32 test_isolation_mode=prepare use_goma=1",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "test r1.gclient runhooks",
@@ -540,7 +423,7 @@
"--config-file",
"[SLAVE_BUILD]\\src\\tools\\mb\\mb_config.pyl",
"--goma-dir",
- "[CACHE]\\cipd\\goma",
+ "[BUILD]\\goma",
"--swarming-targets-file",
"gl_tests\n",
"//out/Release"
@@ -577,10 +460,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",
"--",
"gl_tests",
« no previous file with comments | « scripts/slave/recipes/findit/chromium/test.expected/nonexistent_test_step_skipped.json ('k') | scripts/slave/recipes/findit/chromium/test.expected/swarming_tests.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698