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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2030713004: Refactor chromium.perf recipe configs. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@2-refactorr
Patch Set: Rebase, hope it's right :) Created 4 years, 5 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_perf_fyi_Win_7_Intel_GPU_Perf__Xeon_.json ('k') | scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Win_Clang_Perf.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_perf_fyi_Win_Clang_Builder.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Win_Clang_Builder.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Win_Clang_Builder.json
index 4c56e1bdcfe99681ffaa510c79f2ccad7dc26f75..885aecfd26ff2e74faca4aba77beb1a43b0726a1 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Win_Clang_Builder.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Win_Clang_Builder.json
@@ -136,6 +136,79 @@
]
},
{
+ "cmd": [],
+ "name": "ensure_goma"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[build::cipd]\\resources\\bootstrap.py",
+ "--platform",
+ "windows-386",
+ "--dest-directory",
+ "[SLAVE_BUILD]\\cipd",
+ "--json-output",
+ "/path/to/tmp/json"
+ ],
+ "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"
+ ],
+ "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",
+ "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
+ "[BUILDER_CACHE]\\Win_Clang_Builder\\src\\out\\Release"
+ ],
+ "name": "rmtree clobber",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
+ "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
+ ]
+ },
+ {
"cmd": [
"python",
"-u",
@@ -145,7 +218,7 @@
"cwd": "[BUILDER_CACHE]\\Win_Clang_Builder\\src",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
- "GYP_DEFINES": "branding=Chrome buildtype=Official clang=1 component=static_library fastbuild=1 gomadir='RECIPE_PACKAGE_REPO[build]\\goma' target_arch=ia32 use_goma=0",
+ "GYP_DEFINES": "branding=Chrome buildtype=Official clang=1 component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=ia32 use_goma=1",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
@@ -205,8 +278,16 @@
"[GOMA_DEPS_CACHE]",
"--build-data-dir",
"[ROOT]\\build_data_dir",
+ "--compiler",
+ "goma-clang",
+ "--goma-jsonstatus",
+ "/path/to/tmp/json",
+ "--goma-service-account-json-file",
+ "C:\\creds\\service_accounts\\service-account-goma-client.json",
"--mode",
"official",
+ "--goma-dir",
+ "[CACHE]\\cipd\\goma",
"--",
"chrome",
"chromium_builder_perf"
@@ -214,7 +295,11 @@
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
},
- "name": "compile"
+ "name": "compile",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
+ "@@@STEP_LOG_END@json.output (invalid)@@@"
+ ]
},
{
"allow_subannotations": true,
« no previous file with comments | « scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Win_7_Intel_GPU_Perf__Xeon_.json ('k') | scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Win_Clang_Perf.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698