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

Unified Diff: scripts/slave/recipe_modules/goma/example.expected/linux.json

Issue 2245553002: Inherit appropiate environment variables in goma module for goma_utils.py (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 4 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
Index: scripts/slave/recipe_modules/goma/example.expected/linux.json
diff --git a/scripts/slave/recipe_modules/goma/example.expected/linux.json b/scripts/slave/recipe_modules/goma/example.expected/linux.json
index 5d8808966bd8ee0f46e32efad5d3b106eaf90539..bba45f7e2af8207c1f08ce88bf3a42a0f9b36ce3 100644
--- a/scripts/slave/recipe_modules/goma/example.expected/linux.json
+++ b/scripts/slave/recipe_modules/goma/example.expected/linux.json
@@ -61,7 +61,12 @@
"restart"
],
"env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ "BUILDBOD_BUILDERNAME": "unknown",
+ "BUILDBOT_CLOBBER": "unknown",
+ "BUILDBOT_MASTERNAME": "unknown",
+ "BUILDBOT_SLAVENAME": "unknown",
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+ "GOMA_TMP_DIR": "[TMP_BASE]/goma_tmp_dir_tmp_1"
},
"name": "start_goma"
},
@@ -73,7 +78,12 @@
"stop"
],
"env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ "BUILDBOD_BUILDERNAME": "unknown",
+ "BUILDBOT_CLOBBER": "unknown",
+ "BUILDBOT_MASTERNAME": "unknown",
+ "BUILDBOT_SLAVENAME": "unknown",
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+ "GOMA_TMP_DIR": "[TMP_BASE]/goma_tmp_dir_tmp_1"
},
"name": "stop_goma"
},
@@ -84,6 +94,14 @@
"RECIPE_PACKAGE_REPO[build]/scripts/slave/upload_goma_logs.py",
"--upload-compiler-proxy-info"
],
+ "env": {
+ "BUILDBOD_BUILDERNAME": "unknown",
+ "BUILDBOT_CLOBBER": "unknown",
+ "BUILDBOT_MASTERNAME": "unknown",
+ "BUILDBOT_SLAVENAME": "unknown",
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+ "GOMA_TMP_DIR": "[TMP_BASE]/goma_tmp_dir_tmp_1"
+ },
"name": "upload_log"
},
{

Powered by Google App Engine
This is Rietveld 408576698