add cwd

bin/cbuildbot.py

 #!/usr/bin/python
 
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """CBuildbot is wrapper around the build process used by the pre-flight queue"""
 
 import errno
 import heapq
@@ skipping 479 matching lines @@
          '--overlays=%s' % ':'.join(overlays),
          '--tracking_branch=%s' % tracking_branch
         ]
   if dryrun:
     cmd.append('--dryrun')
 
   cmd.append('push')
   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),
          '--to', '/var/www/archive/' + bot_id,
          '--keep_max', str(keep_max),
          '--prebuilt_upload',
          '--board', buildconfig['board'],
 
          '--acl', '/home/chrome-bot/slave_archive_acl',
          '--gsutil_archive', gsutil_archive,
          '--gsd_gen_index',
            '/b/scripts/gsd_generate_index/gsd_generate_index.py',
          '--gsutil', '/b/scripts/slave/gsutil',
          '--test_mod'
   ]
 
   if buildconfig.get('test_mod', True):
     cmd.append('--test_mod')
 
   if buildconfig.get('factory_install_mod', True):
     cmd.append('--factory_install_mod')
 
   if buildconfig.get('factory_test_mod', True):
     cmd.append('--factory_test_mod')
 
   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):
   """Archives the test results into Google Storage
 
   Takes the results from the test_results_dir and the last qemu image and
   uploads them to Google Storage.
 
   Arguments:
     buildroot: Root directory where build occurs
@@ skipping 246 matching lines @@
                      push_overlays, options.debug)
         else:
           Die('CBUILDBOT - One of the slaves has failed!!!')
 
       else:
         # Publish my status to the master if its expecting it.
         if buildconfig['important'] and not options.debug:
           cbuildbot_comm.PublishStatus(cbuildbot_comm.STATUS_BUILD_COMPLETE)
 
     if buildconfig['archive_build']:
-      _LegacyArchiveBuild(bot_id,
+      _LegacyArchiveBuild(buildroot,
+                          bot_id,
                           buildconfig,
                           options.buildnumber,
                           options.debug)
   except:
     # Send failure to master bot.
     if not buildconfig['master'] and buildconfig['important']:
       cbuildbot_comm.PublishStatus(cbuildbot_comm.STATUS_BUILD_FAILED)
 
     raise
 
 
 if __name__ == '__main__':
     main()