Bug 494367 - map what we did for fx to fennec to have the tree in mobile_config.py - p=l10n,r=ccooper
authorChris Cooper <ccooper@deadsquid.com>
Fri, 22 May 2009 09:14:32 -0400
changeset 1163 9edebdbbb8ee75fa7d0d0ea29acbe9205fbe294b
parent 1162 d7cd3e71df36be056aeaf2dbec5ddad7ef9c3a22
child 1164 304fbb32c547aac69a9a68c7febaf03bd369da0b
push id1
push userroot
push dateWed, 17 Dec 2014 00:18:48 +0000
reviewersccooper
bugs494367
Bug 494367 - map what we did for fx to fennec to have the tree in mobile_config.py - p=l10n,r=ccooper
mozilla2-staging/mobile_config.py
mozilla2-staging/mobile_master.py
mozilla2/mobile_config.py
mozilla2/mobile_master.py
--- a/mozilla2-staging/mobile_config.py
+++ b/mozilla2-staging/mobile_config.py
@@ -96,16 +96,17 @@ MOBILE_BRANCHES['mobile-trunk']['platfor
 MOBILE_BRANCHES['mobile-trunk']['platforms']['wince-arm']['build_space'] = 5
 MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-arm']['base_workdir'] = '%s/build' % SBOX_HOME
 MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-arm']['base_builddir'] = 'maemo-trunk'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-arm']['base_l10n_workdir'] = '%s/l10n' % SBOX_HOME
 MOBILE_BRANCHES['mobile-trunk']['platforms']['wince-arm']['base_workdir'] = '.'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['wince-arm']['base_builddir'] = 'wince-trunk'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['wince-arm']['base_l10n_workdir'] = '.'
 MOBILE_BRANCHES['mobile-trunk']['enable_l10n'] = True
+MOBILE_BRANCHES['mobile-trunk']['tree'] = 'fennec10x'
 MOBILE_BRANCHES['mobile-trunk']['l10n_platforms']['linux-arm'] = 'linux'
 MOBILE_BRANCHES['mobile-trunk']['allLocalesFile'] = "locales/all-locales"
 MOBILE_BRANCHES['mobile-trunk']['l10nUploadPath'] = \
     '/home/ftp/pub/mozilla.org/firefox/nightly/latest-mobile-trunk-l10n'
 MOBILE_BRANCHES['mobile-trunk']['enUS_binaryURL'] = \
     config.DOWNLOAD_BASE_URL + '/nightly/latest-mobile-trunk'
 MOBILE_BRANCHES['mobile-trunk']['tinderbox_tree'] = 'MozillaTest'
 MOBILE_BRANCHES['mobile-trunk']['l10n_tinderbox_tree'] = 'MozillaStaging'
--- a/mozilla2-staging/mobile_master.py
+++ b/mozilla2-staging/mobile_master.py
@@ -54,16 +54,17 @@ for name in sorted(MOBILE_BRANCHES.keys(
         base_name = branch['platforms'][platform]['base_name']
         builders.append('%s build' % base_name)
         mobileBuilders.append('%s build' % base_name)
 
         builder = '%s nightly' % base_name
         nightlyBuilders.append(builder)
         if branch['enable_l10n'] and platform in branch['l10n_platforms']:
             l10nNightlyBuilders[builder] = {}
+            l10nNightlyBuilders[builder]['tree'] = branch['l10n_tree']
             l10nNightlyBuilders[builder]['l10n_builder'] = '%s l10n' % base_name
             l10nNightlyBuilders[builder]['platform'] = branch['l10n_platforms'][platform]
 
     m['status'].append(TinderboxMailNotifier(
         fromaddr="mozilla2.buildbot@build.mozilla.org",
         tree=branch['tinderbox_tree'],
         extraRecipients=['tinderbox-daemon@tinderbox.mozilla.org'],
         relayhost='mail.build.mozilla.org',
@@ -111,19 +112,21 @@ for name in sorted(MOBILE_BRANCHES.keys(
             branch=branch['mobile_repo_path'], # mobile_repo_path
             hour=[1],
             builderNames=[builder]
         )
         m['schedulers'].append(nightly_scheduler)
         if branch['enable_l10n'] and builder in l10nNightlyBuilders:
             l10n_builder = l10nNightlyBuilders[builder]['l10n_builder']
             l10nPlatform = l10nNightlyBuilders[builder]['platform']
+            tree = l10nNightlyBuilders[builder]['tree']
             m['schedulers'].append(NightlyL10n(
                 name=l10n_builder,
                 platform=l10nPlatform,
+                tree=tree,
                 hour=[4],
                 builderNames=[l10n_builder],
                 repoType='hg',
                 branch=branch['mobile_repo_path'],
                 baseTag='default',
                 localesFile=branch['allLocalesFile']
             ))
     m['schedulers'].append(MozScheduler(
@@ -248,16 +251,17 @@ for name in sorted(MOBILE_BRANCHES.keys(
         m['builders'].append(mobile_dep_builder)
         m['builders'].append(mobile_nightly_builder)
 
         if branch['enable_l10n'] and platform in branch['l10n_platforms']:
             mobile_l10n_nightly_factory = None
             if platform == 'linux-arm':
                 mobile_l10n_nightly_factory = MaemoNightlyRepackFactory(
                     hgHost=HGHOST,
+                    tree=branch['l10n_tree'],
                     project=branch['product_name'],
                     appName=branch['app_name'],
                     packageGlob='fennec-*.%(locale)s.linux-arm.tar.bz2',
                     enUSBinaryURL=branch['enUS_binaryURL'],
                     stageServer=STAGE_SERVER,
                     stageUsername=STAGE_USERNAME,
                     stageSshKey=STAGE_SSH_KEY,
                     stageBasePath=STAGE_BASE_PATH,
--- a/mozilla2/mobile_config.py
+++ b/mozilla2/mobile_config.py
@@ -96,16 +96,17 @@ MOBILE_BRANCHES['mobile-trunk']['platfor
 MOBILE_BRANCHES['mobile-trunk']['platforms']['wince-arm']['build_space'] = 5
 MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-arm']['base_workdir'] = '%s/build' % SBOX_HOME
 MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-arm']['base_builddir'] = 'maemo-trunk'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-arm']['base_l10n_workdir'] = '%s/l10n' % SBOX_HOME
 MOBILE_BRANCHES['mobile-trunk']['platforms']['wince-arm']['base_workdir'] = '.'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['wince-arm']['base_builddir'] = 'wince-trunk'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['wince-arm']['base_l10n_workdir'] = '.'
 MOBILE_BRANCHES['mobile-trunk']['enable_l10n'] = True
+MOBILE_BRANCHES['mobile-trunk']['tree'] = 'fennec10x'
 MOBILE_BRANCHES['mobile-trunk']['l10n_platforms']['linux-arm'] = 'linux'
 MOBILE_BRANCHES['mobile-trunk']['allLocalesFile'] = "locales/all-locales"
 MOBILE_BRANCHES['mobile-trunk']['l10nUploadPath'] = \
     '/home/ftp/pub/mozilla.org/firefox/nightly/latest-mobile-trunk-l10n'
 MOBILE_BRANCHES['mobile-trunk']['enUS_binaryURL'] = \
     config.DOWNLOAD_BASE_URL + '/nightly/latest-mobile-trunk'
 MOBILE_BRANCHES['mobile-trunk']['tinderbox_tree'] = 'Mobile'
 MOBILE_BRANCHES['mobile-trunk']['l10n_tinderbox_tree'] = 'Mozilla-l10n'
--- a/mozilla2/mobile_master.py
+++ b/mozilla2/mobile_master.py
@@ -54,16 +54,17 @@ for name in sorted(MOBILE_BRANCHES.keys(
         base_name = branch['platforms'][platform]['base_name']
         builders.append('%s build' % base_name)
         mobileBuilders.append('%s build' % base_name)
 
         builder = '%s nightly' % base_name
         nightlyBuilders.append(builder)
         if branch['enable_l10n'] and platform in branch['l10n_platforms']:
             l10nNightlyBuilders[builder] = {}
+            l10nNightlyBuilders[builder]['tree'] = branch['l10n_tree']
             l10nNightlyBuilders[builder]['l10n_builder'] = '%s l10n' % base_name
             l10nNightlyBuilders[builder]['platform'] = branch['l10n_platforms'][platform]
 
     m['status'].append(TinderboxMailNotifier(
         fromaddr="mozilla2.buildbot@build.mozilla.org",
         tree=branch['tinderbox_tree'],
         extraRecipients=['tinderbox-daemon@tinderbox.mozilla.org'],
         relayhost='mail.build.mozilla.org',
@@ -111,19 +112,21 @@ for name in sorted(MOBILE_BRANCHES.keys(
             branch=branch['mobile_repo_path'], # mobile_repo_path
             hour=[1],
             builderNames=[builder]
         )
         m['schedulers'].append(nightly_scheduler)
         if branch['enable_l10n'] and builder in l10nNightlyBuilders:
             l10n_builder = l10nNightlyBuilders[builder]['l10n_builder']
             l10nPlatform = l10nNightlyBuilders[builder]['platform']
+            tree = l10nNightlyBuilders[builder]['tree']
             m['schedulers'].append(NightlyL10n(
                 name=l10n_builder,
                 platform=l10nPlatform,
+                tree=tree,
                 hour=[4],
                 builderNames=[l10n_builder],
                 repoType='hg',
                 branch=branch['mobile_repo_path'],
                 baseTag='default',
                 localesFile=branch['allLocalesFile']
             ))
     m['schedulers'].append(MozScheduler(
@@ -248,16 +251,17 @@ for name in sorted(MOBILE_BRANCHES.keys(
         m['builders'].append(mobile_dep_builder)
         m['builders'].append(mobile_nightly_builder)
 
         if branch['enable_l10n'] and platform in branch['l10n_platforms']:
             mobile_l10n_nightly_factory = None
             if platform == 'linux-arm':
                 mobile_l10n_nightly_factory = MaemoNightlyRepackFactory(
                     hgHost=HGHOST,
+                    tree=branch['l10n_tree'],
                     project=branch['product_name'],
                     appName=branch['app_name'],
                     packageGlob='fennec-*.%(locale)s.linux-arm.tar.bz2',
                     enUSBinaryURL=branch['enUS_binaryURL'],
                     stageServer=STAGE_SERVER,
                     stageUsername=STAGE_USERNAME,
                     stageSshKey=STAGE_SSH_KEY,
                     stageBasePath=STAGE_BASE_PATH,