bug 620230 - Allow a product name to be set on makeLogUploadCommand, r=bhearsum
authorRobert Kaiser <kairo@kairo.at>
Tue, 11 Jan 2011 16:59:03 +0100
changeset 1220 cb0d3af49235e3d300c424eafda7adaeecc3579c
parent 1217 b84e37d4a464b50eb56d5ee9fdc2a46b7ec3cfd6
child 1221 d9e6e02b146f00cb88233f748e4a993c9c1ecfa7
push id813
push userkairo@kairo.at
push dateTue, 11 Jan 2011 16:00:11 +0000
reviewersbhearsum
bugs620230
bug 620230 - Allow a product name to be set on makeLogUploadCommand, r=bhearsum
misc.py
--- a/misc.py
+++ b/misc.py
@@ -1559,17 +1559,17 @@ def generateCCBranchObjects(config, name
         if config['enable_codecoverage'] and platform in ('linux',):
             coverageBuilders.append('%s code coverage' % base_name)
         if config.get('enable_blocklist_update', False) and platform in ('linux',):
             weeklyBuilders.append('%s blocklist update' % base_name)
     if config['enable_weekly_bundle']:
         weeklyBuilders.append('%s hg bundle' % name)
 
     logUploadCmd = makeLogUploadCommand(name, config, is_try=config.get('enable_try'),
-            is_shadow=bool(name=='shadow-central'))
+            is_shadow=bool(name=='shadow-central'), product=config['product_name'])
 
     branchObjects['status'].append(SubprocessLogHandler(
         logUploadCmd,
         builders=builders + unittestBuilders + debugBuilders,
     ))
 
     if nightlyBuilders:
         branchObjects['status'].append(SubprocessLogHandler(
@@ -2950,17 +2950,17 @@ def generateProjectObjects(project, conf
     # Valgrind
     elif project == 'valgrind':
         valgrindObjects = generateValgrindObjects(config, SLAVES)
         buildObjects = mergeBuildObjects(buildObjects, valgrindObjects)
 
     return buildObjects
 
 def makeLogUploadCommand(branch_name, config, is_try=False, is_shadow=False,
-        platform_prop="platform"):
+        platform_prop="platform", product=None):
     extra_args = []
     if config.get('enable_mail_notifier'):
         if config.get('notify_real_author'):
             extraRecipients = []
             sendToAuthor = True
         else:
             extraRecipients = config['email_override']
             sendToAuthor = False
@@ -2978,15 +2978,18 @@ def makeLogUploadCommand(branch_name, co
          '%s/bin/%s' % (buildbotcustom.__path__[0], upload_cmd),
          config['stage_server'],
          '-u', config['stage_username'],
          '-i', os.path.expanduser("~/.ssh/%s" % config['stage_ssh_key']),
          '-b', branch_name,
          '-p', WithProperties("%%(%s)s" % platform_prop),
         ] + extra_args
 
+    if product:
+        logUploadCmd.extend(['--product', product])
+
     if is_try:
         logUploadCmd.append('--try')
 
     if is_shadow:
         logUploadCmd.append('--shadow')
 
     return logUploadCmd