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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium_codesearch.expected/full_ChromiumOS_Codesearch.json

Issue 2356123002: Revert of Use [CACHE]/cipd/goma for goma_dir in recipes/chromium_codesearch.py (Closed)
Patch Set: Created 4 years, 3 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_codesearch.py ('k') | scripts/slave/recipes/chromium_codesearch.expected/full_ChromiumOS_Codesearch_Builder.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium_codesearch.expected/full_ChromiumOS_Codesearch.json
diff --git a/scripts/slave/recipes/chromium_codesearch.expected/full_ChromiumOS_Codesearch.json b/scripts/slave/recipes/chromium_codesearch.expected/full_ChromiumOS_Codesearch.json
index f214b2ad8ccd7d2ef0ab21b936ce74c3ac1ad3d2..847f59078d45229d1ba4ade4952dad97a0fe6c14 100644
--- a/scripts/slave/recipes/chromium_codesearch.expected/full_ChromiumOS_Codesearch.json
+++ b/scripts/slave/recipes/chromium_codesearch.expected/full_ChromiumOS_Codesearch.json
@@ -117,64 +117,6 @@
]
},
{
- "cmd": [],
- "name": "ensure_goma"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::cipd]/resources/bootstrap.py",
- "--platform",
- "linux-amd64",
- "--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/tools/cloudtail/linux-amd64 goma_recipe_module\ninfra_internal/goma/client/linux-amd64 release",
- "--json-output",
- "/path/to/tmp/json",
- "--service-account-json",
- "/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-goma_recipe_modu\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/linux-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@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/linux-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [
"python",
"-u",
@@ -184,7 +126,7 @@
"cwd": "[SLAVE_BUILD]/src",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "GYP_DEFINES": "clang=1 component=shared_library fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=x64 use_goma=1",
+ "GYP_DEFINES": "clang=1 component=shared_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=x64 use_goma=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
@@ -194,64 +136,10 @@
"[SLAVE_BUILD]/src/buildtools/linux64/gn",
"gen",
"[SLAVE_BUILD]/src/out/Debug",
- "--args=is_clang=true is_component_build=true is_debug=true symbol_level=1 target_cpu=\"x64\" target_os=\"chromeos\" use_ozone=true use_goma=true goma_dir=[CACHE]/cipd/goma"
+ "--args=is_clang=true is_component_build=true is_debug=true goma_dir=\"/b/build/goma\" symbol_level=1 target_cpu=\"x64\" use_goma=true target_os=\"chromeos\" use_ozone=true"
],
"cwd": "[SLAVE_BUILD]/src",
"name": "generate build files for chromeos"
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport multiprocessing\nimport sys\n\njob_limit = 200\nif sys.platform.startswith('linux'):\n # Use 80 for linux not to load goma backend.\n job_limit = 80\n\ntry:\n jobs = min(job_limit, multiprocessing.cpu_count() * 10)\nexcept NotImplementedError:\n jobs = 50\n\nprint jobs\n"
- ],
- "name": "calculate the number of recommended jobs",
- "stdout": "/path/to/tmp/",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import multiprocessing@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@job_limit = 200@@@",
- "@@@STEP_LOG_LINE@python.inline@if sys.platform.startswith('linux'):@@@",
- "@@@STEP_LOG_LINE@python.inline@ # Use 80 for linux not to load goma backend.@@@",
- "@@@STEP_LOG_LINE@python.inline@ job_limit = 80@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@try:@@@",
- "@@@STEP_LOG_LINE@python.inline@ jobs = min(job_limit, multiprocessing.cpu_count() * 10)@@@",
- "@@@STEP_LOG_LINE@python.inline@except NotImplementedError:@@@",
- "@@@STEP_LOG_LINE@python.inline@ jobs = 50@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@print jobs@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "[CACHE]/cipd/goma/goma_ctl.py",
- "restart"
- ],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
- },
- "name": "start_goma"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
- "start",
- "--cloudtail-path",
- "[CACHE]/cipd/goma/cloudtail"
- ],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
- },
- "name": "start cloudtail",
- "stdout": "/path/to/tmp/"
},
{
"cmd": [
@@ -264,88 +152,10 @@
"cc",
"cxx",
"objc",
- "objcxx",
- "-j",
- "50"
+ "objcxx"
],
"name": "generate compilation database for chromeos",
"stdout": "/path/to/tmp/"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[CACHE]/cipd/goma/goma_ctl.py",
- "jsonstatus",
- "[CACHE]/cipd/goma/jsonstatus"
- ],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
- },
- "name": "goma_jsonstatus"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[CACHE]/cipd/goma/goma_ctl.py",
- "stat"
- ],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
- },
- "name": "goma_stat"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[CACHE]/cipd/goma/goma_ctl.py",
- "stop"
- ],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
- },
- "name": "stop_goma"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/upload_goma_logs.py",
- "--upload-compiler-proxy-info",
- "--json-status",
- "[CACHE]/cipd/goma/jsonstatus",
- "--ninja-log-outdir",
- "[SLAVE_BUILD]/src/out/Debug",
- "--ninja-log-compiler",
- "goma",
- "--ninja-log-command",
- "['ninja', '-C', Path('checkout', 'out','Debug'), 'All', '-t', 'compdb', 'cc', 'cxx', 'objc', 'objcxx', '-j', 50]",
- "--ninja-log-exit-status",
- "0",
- "--buildbot-buildername",
- "ChromiumOS Codesearch",
- "--buildbot-mastername",
- "chromium.infra.cron",
- "--buildbot-slavename",
- "TestSlavename"
- ],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
- },
- "name": "upload_log"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
- "stop",
- "--killed-pid",
- "12345"
- ],
- "name": "stop cloudtail"
},
{
"allow_subannotations": true,
@@ -402,7 +212,7 @@
"--goma-service-account-json-file",
"/creds/service_accounts/service-account-goma-client.json",
"--goma-dir",
- "[CACHE]/cipd/goma",
+ "[BUILD]/goma",
"--",
"All"
],
@@ -428,37 +238,10 @@
"[SLAVE_BUILD]/src/buildtools/linux64/gn",
"gen",
"[SLAVE_BUILD]/src/out/Debug",
- "--args=is_clang=true is_component_build=true is_debug=true symbol_level=1 target_cpu=\"x64\" use_goma=true goma_dir=[CACHE]/cipd/goma"
+ "--args=is_clang=true is_component_build=true is_debug=true goma_dir=\"/b/build/goma\" symbol_level=1 target_cpu=\"x64\" use_goma=true"
],
"cwd": "[SLAVE_BUILD]/src",
"name": "generate build files for linux"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[CACHE]/cipd/goma/goma_ctl.py",
- "restart"
- ],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
- },
- "name": "start_goma (2)"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
- "start",
- "--cloudtail-path",
- "[CACHE]/cipd/goma/cloudtail"
- ],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
- },
- "name": "start cloudtail (2)",
- "stdout": "/path/to/tmp/"
},
{
"cmd": [
@@ -471,88 +254,10 @@
"cc",
"cxx",
"objc",
- "objcxx",
- "-j",
- "50"
+ "objcxx"
],
"name": "generate compilation database for linux",
"stdout": "/path/to/tmp/"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[CACHE]/cipd/goma/goma_ctl.py",
- "jsonstatus",
- "[CACHE]/cipd/goma/jsonstatus"
- ],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
- },
- "name": "goma_jsonstatus (2)"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[CACHE]/cipd/goma/goma_ctl.py",
- "stat"
- ],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
- },
- "name": "goma_stat (2)"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[CACHE]/cipd/goma/goma_ctl.py",
- "stop"
- ],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
- },
- "name": "stop_goma (2)"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/upload_goma_logs.py",
- "--upload-compiler-proxy-info",
- "--json-status",
- "[CACHE]/cipd/goma/jsonstatus",
- "--ninja-log-outdir",
- "[SLAVE_BUILD]/src/out/Debug",
- "--ninja-log-compiler",
- "goma",
- "--ninja-log-command",
- "['ninja', '-C', Path('checkout', 'out','Debug'), 'All', '-t', 'compdb', 'cc', 'cxx', 'objc', 'objcxx', '-j', 50]",
- "--ninja-log-exit-status",
- "0",
- "--buildbot-buildername",
- "ChromiumOS Codesearch",
- "--buildbot-mastername",
- "chromium.infra.cron",
- "--buildbot-slavename",
- "TestSlavename"
- ],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
- },
- "name": "upload_log (2)"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[build::goma]/resources/cloudtail_utils.py",
- "stop",
- "--killed-pid",
- "12345"
- ],
- "name": "stop cloudtail (2)"
},
{
"cmd": [
« no previous file with comments | « scripts/slave/recipes/chromium_codesearch.py ('k') | scripts/slave/recipes/chromium_codesearch.expected/full_ChromiumOS_Codesearch_Builder.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698