merge from preproduction branch production-0.8
authorLukas Blakk <lsblakk@mozilla.com>
Tue, 07 Dec 2010 16:43:49 -0800
branchproduction-0.8
changeset 1138 6143ef252d9c6310cfaed724147dc057c0dceda8
parent 1134 99238d5bb3dc355daaf29225f172dd271060d773 (current diff)
parent 1137 4febe8d47e48946fe874142f176efa06ddfbf565 (diff)
child 1140 13e93039ad4475a001d027bef0efe57aa00ff5a5
push id749
push userlsblakk@mozilla.com
push dateWed, 08 Dec 2010 00:44:08 +0000
merge from preproduction branch
--- a/process/factory.py
+++ b/process/factory.py
@@ -4538,21 +4538,25 @@ class MajorUpdateFactory(ReleaseUpdatesF
 
     def getSnippetDir(self):
         date = strftime('%Y%m%d')
         return '%s-%s-%s-%s-MU' % (date, self.brandName, self.oldVersion,
                                    self.version)
 
 
 class UpdateVerifyFactory(ReleaseFactory):
-    def __init__(self, verifyConfig, buildSpace=.3, **kwargs):
+    def __init__(self, verifyConfig, buildSpace=.3, useOldUpdater=False,
+                 **kwargs):
         ReleaseFactory.__init__(self, repoPath='nothing',
                                 buildSpace=buildSpace, **kwargs)
+        command=['bash', 'verify.sh', '-c', verifyConfig]
+        if useOldUpdater:
+            command.append('--old-updater')
         self.addStep(UpdateVerify,
-         command=['bash', 'verify.sh', '-c', verifyConfig],
+         command=command,
          workdir='tools/release/updates',
          description=['./verify.sh', verifyConfig]
         )
 
 
 class ReleaseFinalVerification(ReleaseFactory):
     def __init__(self, verifyConfigs, **kwargs):
         # MozillaBuildFactory needs the 'repoPath' argument, but we don't
@@ -6943,17 +6947,17 @@ class UnittestPackagedBuildFactory(Mozil
                 self.addStep(unittest_steps.MozillaPackagedJetpackTests(
                   suite=suite,
                   env=self.env,
                   leakThreshold=leak_threshold,
                   symbols_path='symbols',
                   maxTime=120*60, # Two Hours
                  ))
             elif suite in ('reftest', 'reftest-d2d', 'crashtest', \
-                           'direct3D', 'opengl'):
+                           'direct3D', 'opengl', 'reftest-no-d2d-d3d'):
                 if suite in ('direct3D', 'opengl'):
                     self.env.update({'MOZ_ACCELERATED':'11'})
                 # Unpack the tests
                 self.addStep(UnpackTest(
                  filename=WithProperties('%(tests_filename)s'),
                  testtype='reftest',
                  haltOnFailure=True,
                  name='unpack reftest tests',
--- a/process/release.py
+++ b/process/release.py
@@ -20,16 +20,19 @@ from buildbotcustom.process.factory impo
   PartnerRepackFactory, MajorUpdateFactory, XulrunnerReleaseBuildFactory, \
   TuxedoEntrySubmitterFactory, makeDummyBuilder
 from buildbotcustom.changes.ftppoller import FtpPoller, LocalesFtpPoller
 from release.platforms import ftp_platform_map, sl_platform_map
 
 DEFAULT_L10N_CHUNKS = 15
 
 def generateReleaseBranchObjects(releaseConfig, branchConfig, staging):
+    # This variable is one thing that forces us into reconfiging prior to a
+    # release. It should be removed as soon as nothing depends on it.
+    releaseTag = '%s_RELEASE' % releaseConfig['baseTag']
     l10nChunks = releaseConfig.get('l10nChunks', DEFAULT_L10N_CHUNKS)
     tools_repo = '%s%s' % (branchConfig['hgurl'],
                            branchConfig['build_tools_repo_path'])
     if staging:
         branchConfigFile = "mozilla/staging_config.py"
     else:
         branchConfigFile = "mozilla/production_config.py"
 
@@ -137,20 +140,20 @@ def generateReleaseBranchObjects(release
 
     builders = []
     test_builders = []
     schedulers = []
     change_source = []
     notify_builders = []
     status = []
 
-    shippedLocalesFile = "%s/%s/raw-file/%s_RELEASE/%s" % (
+    shippedLocalesFile = "%s/%s/raw-file/%s/%s" % (
                             branchConfig['hgurl'],
                             releaseConfig['sourceRepoPath'],
-                            releaseConfig['baseTag'],
+                            releaseTag,
                             releaseConfig['shippedLocalesPath'])
 
     ##### Change sources and Schedulers
     if releaseConfig['doPartnerRepacks']:
         for p in releaseConfig['l10nPlatforms']:
             ftpPlatform = ftp_platform_map[p]
 
             ftpURLs = ["http://%s/pub/mozilla.org/%s/nightly/%s-candidates/build%s/%s" % (
@@ -490,17 +493,17 @@ def generateReleaseBranchObjects(release
                 platform=platform,
                 hgHost=branchConfig['hghost'],
                 repoPath=releaseConfig['sourceRepoPath'],
                 buildToolsRepoPath=branchConfig['build_tools_repo_path'],
                 configRepoPath=branchConfig['config_repo_path'],
                 configSubDir=branchConfig['config_subdir'],
                 profiledBuild=pf['profiled_build'],
                 mozconfig=mozconfig,
-                buildRevision='%s_RELEASE' % releaseConfig['baseTag'],
+                buildRevision=releaseTag,
                 stageServer=branchConfig['stage_server'],
                 stageUsername=branchConfig['stage_username'],
                 stageGroup=branchConfig['stage_group'],
                 stageSshKey=branchConfig['stage_ssh_key'],
                 stageBasePath=branchConfig['stage_base_path'],
                 codesighs=False,
                 uploadPackages=True,
                 uploadSymbols=True,
@@ -589,17 +592,17 @@ def generateReleaseBranchObjects(release
                 platform=platform,
                 hgHost=branchConfig['hghost'],
                 repoPath=releaseConfig['sourceRepoPath'],
                 buildToolsRepoPath=branchConfig['build_tools_repo_path'],
                 configRepoPath=branchConfig['config_repo_path'],
                 configSubDir=branchConfig['config_subdir'],
                 profiledBuild=None,
                 mozconfig = '%s/%s/xulrunner' % (platform, releaseConfig['sourceRepoName']),
-                buildRevision='%s_RELEASE' % releaseConfig['baseTag'],
+                buildRevision=releaseTag,
                 stageServer=branchConfig['stage_server'],
                 stageUsername=branchConfig['stage_username_xulrunner'],
                 stageGroup=branchConfig['stage_group'],
                 stageSshKey=branchConfig['stage_ssh_xulrunner_key'],
                 stageBasePath=branchConfig['stage_base_path_xulrunner'],
                 codesighs=False,
                 uploadPackages=True,
                 uploadSymbols=True,
@@ -633,16 +636,17 @@ def generateReleaseBranchObjects(release
              partner_repack_factory = PartnerRepackFactory(
                  hgHost=branchConfig['hghost'],
                  repoPath=releaseConfig['sourceRepoPath'],
                  buildToolsRepoPath=branchConfig['build_tools_repo_path'],
                  productName=releaseConfig['productName'],
                  version=releaseConfig['version'],
                  buildNumber=releaseConfig['buildNumber'],
                  partnersRepoPath=releaseConfig['partnersRepoPath'],
+                 partnersRepoRevision=releaseTag,
                  platformList=[platform],
                  stagingServer=releaseConfig['stagingServer'],
                  stageUsername=branchConfig['stage_username'],
                  stageSshKey=branchConfig['stage_ssh_key'],
              )
   
              if 'macosx64' in branchConfig['platforms']:
                  slaves = branchConfig['platforms']['macosx64']['slaves']
@@ -741,16 +745,17 @@ def generateReleaseBranchObjects(release
 
 
     for platform in sorted(releaseConfig['verifyConfigs'].keys()):
         update_verify_factory = UpdateVerifyFactory(
             hgHost=branchConfig['hghost'],
             buildToolsRepoPath=branchConfig['build_tools_repo_path'],
             verifyConfig=releaseConfig['verifyConfigs'][platform],
             clobberURL=branchConfig['base_clobber_url'],
+            useOldUpdater=branchConfig['use_old_updater'],
         )
 
         builders.append({
             'name': builderPrefix('%s_update_verify' % platform),
             'slavenames': branchConfig['platforms'][platform]['slaves'],
             'category': builderPrefix(''),
             'builddir': builderPrefix('%s_update_verify' % platform),
             'factory': update_verify_factory,
@@ -828,16 +833,17 @@ def generateReleaseBranchObjects(release
         })
 
         for platform in sorted(releaseConfig['majorUpdateVerifyConfigs'].keys()):
             major_update_verify_factory = UpdateVerifyFactory(
                 hgHost=branchConfig['hghost'],
                 buildToolsRepoPath=branchConfig['build_tools_repo_path'],
                 verifyConfig=releaseConfig['majorUpdateVerifyConfigs'][platform],
                 clobberURL=branchConfig['base_clobber_url'],
+                useOldUpdater=branchConfig['use_old_updater'],
             )
 
             builders.append({
                 'name': builderPrefix('%s_major_update_verify' % platform),
                 'slavenames': branchConfig['platforms'][platform]['slaves'],
                 'category': builderPrefix(''),
                 'builddir': builderPrefix('%s_major_update_verify' % platform),
                 'factory': major_update_verify_factory,
--- a/steps/unittest.py
+++ b/steps/unittest.py
@@ -717,16 +717,20 @@ class MozillaPackagedReftests(ShellComma
         if suite == 'crashtest':
             self.command.append('reftest/tests/testing/crashtest/crashtests.list')
         elif suite in ('reftest', 'direct3D', 'opengl'):
             self.command.append('reftest/tests/layout/reftests/reftest.list')
         elif suite == 'reftest-d2d':
             self.command.append('--setpref=gfx.font_rendering.directwrite.enabled=true')
             self.command.append('--setpref=mozilla.widget.render-mode=6')
             self.command.append('reftest/tests/layout/reftests/reftest.list')
+        elif suite == 'reftest-no-d2d-d3d':
+            self.command.append('--setpref=gfx.direct2d.disabled=true')
+            self.command.append('--setpref=layers.accelerate-none=true')
+            self.command.append('reftest/tests/layout/reftests/reftest.list')
         elif suite == 'jsreftest':
             self.command.append('--extra-profile-file=jsreftest/tests/user.js')
             self.command.append('jsreftest/tests/jstests.list')
 
     def createSummary(self, log):
         self.addCompleteLog('summary', summarizeLogReftest(self.name, log))
 
     def evaluateCommand(self, cmd):