merge default -> production

--HG-- branch : production-0.8
mozilla-releng · Mar 12, 2012 · 974afc3 · 974afc3
2 parents 7303c74 + 3a36517
commit 974afc3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/process/factory.py b/process/factory.py
@@ -50,7 +50,7 @@
 reload(release.paths)
 
 from buildbotcustom.status.errors import purge_error, global_errors, \
-  upload_errors
+  upload_errors, talos_hgweb_errors
 from buildbotcustom.steps.base import ShellCommand, SetProperty, Mercurial, \
   Trigger, RetryingShellCommand, RetryingSetProperty
 from buildbotcustom.steps.misc import TinderboxShellCommand, SendChangeStep, \
@@ -5446,7 +5446,9 @@ def __init__(self, verifyConfig, buildSpace=.3, useOldUpdater=False,
 class ReleaseFinalVerification(ReleaseFactory):
     def __init__(self, verifyConfigs, platforms=None, **kwargs):
         # MozillaBuildFactory needs the 'repoPath' argument, but we don't
-        ReleaseFactory.__init__(self, repoPath='nothing', **kwargs)
+        if 'repoPath' not in kwargs:
+            kwargs['repoPath'] = 'nothing'
+        ReleaseFactory.__init__(self, **kwargs)
         verifyCommand = ['bash', 'final-verification.sh']
         platforms = platforms or sorted(verifyConfigs.keys())
         for platform in platforms:
@@ -6374,8 +6376,9 @@ def __init__(self, cvsroot, stagingServer, productName, version,
                  platform, verifyDir='verify', linuxExtension='bz2',
                  buildSpace=4, **kwargs):
         # MozillaBuildFactory needs the 'repoPath' argument, but we don't
-        ReleaseFactory.__init__(self, repoPath='nothing', buildSpace=buildSpace,
-                                **kwargs)
+        if 'repoPath' not in kwargs:
+                    kwargs['repoPath'] = 'nothing'
+        ReleaseFactory.__init__(self, buildSpace=buildSpace, **kwargs)
 
         verifyDirVersion = 'tools/release/l10n'
         platformFtpDir = getPlatformFtpDir(platform)
@@ -6977,10 +6980,6 @@ def __init__(self, platform, suites, hostUtils, productName='fennec',
                 remoteExtras=None, branchName=None, **kwargs):
         self.suites = suites
         self.hostUtils = hostUtils
-        self.env = {}
-
-        self.env['MINIDUMP_STACKWALK'] = getPlatformMinidumpPath(platform)
-        self.env['MINIDUMP_SAVE_PATH'] = WithProperties('%(basedir:-)s/minidumps')
 
         if remoteExtras is not None:
             self.remoteExtras = remoteExtras
@@ -6996,11 +6995,15 @@ def __init__(self, platform, suites, hostUtils, productName='fennec',
             else:
                 self.remoteProcessName = 'org.mozilla.fennec'
 
+        env = {}
+        env['MINIDUMP_STACKWALK'] = getPlatformMinidumpPath(platform)
+        env['MINIDUMP_SAVE_PATH'] = WithProperties('%(basedir:-)s/minidumps')
+
         MozillaTestFactory.__init__(self, platform, productName=productName,
                                     downloadSymbols=downloadSymbols,
                                     downloadTests=downloadTests,
                                     posixBinarySuffix=posixBinarySuffix,
-                                    **kwargs)
+                                    env=env, **kwargs)
 
     def addCleanupSteps(self):
         '''Clean up the relevant places before starting a build'''
@@ -7604,7 +7607,8 @@ def addSetupSteps(self):
                     url=WithProperties("%(repo_path)s/raw-file/%(revision)s/testing/talos/talos_from_code.py"),
                     workdir=self.workdirBase,
                     haltOnFailure=True,
-                    wget_args=['--progress=dot:mega', '--no-check-certificate']
+                    wget_args=['--progress=dot:mega', '--no-check-certificate'],
+                    log_eval_func=lambda c,s: regex_log_evaluator(c, s, talos_hgweb_errors),
                 ))
                 self.addStep(ShellCommand(
                     name='download files specified in talos.json',
@@ -7613,6 +7617,7 @@ def addSetupSteps(self):
                             WithProperties('%(repo_path)s/raw-file/%(revision)s/testing/talos/talos.json')],
                     workdir=self.workdirBase,
                     haltOnFailure=True,
+                    log_eval_func=lambda c,s: regex_log_evaluator(c, s, talos_hgweb_errors),
                 ))
             else:
                 self.addStep(DownloadFile(

diff --git a/process/release.py b/process/release.py
@@ -848,6 +848,7 @@ def majorUpdateVerifyBuilders(platform):
                 oldBuildNumber=releaseConfig['oldBuildNumber'],
                 clobberURL=branchConfig['base_clobber_url'],
                 platform=platform,
+                repoPath=sourceRepoInfo['path'],
             )
 
             if 'macosx64' in branchConfig['platforms']:
@@ -1122,6 +1123,7 @@ def majorUpdateVerifyBuilders(platform):
             buildToolsRepoPath=tools_repo_path,
             verifyConfigs=releaseConfig['verifyConfigs'],
             clobberURL=branchConfig['base_clobber_url'],
+            repoPath=sourceRepoInfo['path'],
         )
 
         builders.append({

diff --git a/status/errors.py b/status/errors.py
@@ -26,3 +26,7 @@
                  (re.compile("Connection refused"), RETRY),
                  (re.compile("Connection reset by peer"), RETRY),
                 )
+
+talos_hgweb_errors = ((re.compile("ERROR 500: Internal Server Error"), RETRY),
+                      (re.compile("ERROR: We tried to download the talos.json file but something failed"), RETRY),
+                     )