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

Unified Diff: bin/cbuildbot.py

Issue 6392010: add cwd (Closed) Base URL: http://git.chromium.org/git/crosutils.git@master
Patch Set: Fix missing buildroot Created 9 years, 11 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: bin/cbuildbot.py
diff --git a/bin/cbuildbot.py b/bin/cbuildbot.py
index 02513533793e53af88da8e6b9fc741d67f74f395..be71830d7a38ad67a02f2071d1bff26bd847b3b7 100755
--- a/bin/cbuildbot.py
+++ b/bin/cbuildbot.py
@@ -497,12 +497,14 @@ def _UprevPush(buildroot, tracking_branch, board, overlays, dryrun):
RunCommand(cmd, cwd=cwd)
-def _LegacyArchiveBuild(bot_id, buildconfig, buildnumber, debug=False):
+def _LegacyArchiveBuild(buildroot, bot_id, buildconfig, buildnumber,
+ debug=False):
"""Adds a step to the factory to archive a build."""
# Fixed properties
keep_max = 3
gsutil_archive = 'gs://chromeos-archive/' + bot_id
+ cwd = os.path.join(buildroot, 'src', 'scripts')
cmd = ['./archive_build.sh',
'--build_number', str(buildnumber),
@@ -531,7 +533,7 @@ def _LegacyArchiveBuild(bot_id, buildconfig, buildnumber, debug=False):
if debug:
Warning('***** ***** LegacyArchiveBuild CMD: ' + ' '.join(cmd))
else:
- RunCommand(cmd)
+ RunCommand(cmd, cwd=cwd)
def _ArchiveTestResults(buildroot, board, test_results_dir,
gsutil, archive_dir, acl):
@@ -798,7 +800,8 @@ def main():
cbuildbot_comm.PublishStatus(cbuildbot_comm.STATUS_BUILD_COMPLETE)
if buildconfig['archive_build']:
- _LegacyArchiveBuild(bot_id,
+ _LegacyArchiveBuild(buildroot,
+ bot_id,
buildconfig,
options.buildnumber,
options.debug)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698