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

Unified Diff: scripts/slave/recipes/cros/cbuildbot_tryjob.expected/internal.json

Issue 1345143004: CrOS: Use local Chromite checkout for configs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Rebased, comments, more useful expectations. Created 5 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
Index: scripts/slave/recipes/cros/cbuildbot_tryjob.expected/internal.json
diff --git a/scripts/slave/recipes/cros/cbuildbot_tryjob.expected/unknown_config.json b/scripts/slave/recipes/cros/cbuildbot_tryjob.expected/internal.json
similarity index 66%
copy from scripts/slave/recipes/cros/cbuildbot_tryjob.expected/unknown_config.json
copy to scripts/slave/recipes/cros/cbuildbot_tryjob.expected/internal.json
index e7d9cb695da0de2f5499cd6d238190a06c677a8e..b85723f2888036667864f4b78771e96e756823ce 100644
--- a/scripts/slave/recipes/cros/cbuildbot_tryjob.expected/unknown_config.json
+++ b/scripts/slave/recipes/cros/cbuildbot_tryjob.expected/internal.json
@@ -7,7 +7,7 @@
"--master",
"chromiumos.tryserver",
"--builder",
- "etc",
+ "paladin",
"--slave",
"test",
"--spec",
@@ -49,18 +49,38 @@
"name": "checkout chromite branch [master]"
},
{
+ "cmd": [
+ "python",
+ "-u",
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+ "[SLAVE_BUILD]/chromite/cbuildbot/config_dump.json",
+ "/path/to/tmp/json"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "read chromite config",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@config@{@@@",
+ "@@@STEP_LOG_LINE@config@ \"internal-paladin\": {@@@",
+ "@@@STEP_LOG_LINE@config@ \"_template\": \"paladin\", @@@",
+ "@@@STEP_LOG_LINE@config@ \"internal\": true, @@@",
+ "@@@STEP_LOG_LINE@config@ \"type\": \"paladin\"@@@",
+ "@@@STEP_LOG_LINE@config@ }@@@",
+ "@@@STEP_LOG_LINE@config@}@@@",
+ "@@@STEP_LOG_END@config@@@"
+ ]
+ },
+ {
"allow_subannotations": true,
"cmd": [
"[SLAVE_BUILD]/chromite/bin/cbuildbot",
"--buildroot",
- "[ROOT]/cbuild/etc_master",
- "--clobber",
+ "[ROOT]/cbuild/internal_master",
"--timeout",
"14400",
"--remote-trybot",
"--remote-version=4",
- "xxx-fakeboard-fakebuild"
+ "internal-paladin"
],
- "name": "cbuildbot [xxx-fakeboard-fakebuild]"
+ "name": "cbuildbot [internal-paladin]"
}
]

Powered by Google App Engine
This is Rietveld 408576698