Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

merge default -> production-0.8

--HG--
branch : production-0.8
  • Loading branch information...
commit 7da96ba33be762d75ffd09add500853e270987b7 2 parents db154d6 + 889324a
Aki Sasaki escapewindow authored
8 misc.py
View
@@ -1815,6 +1815,8 @@ def generateTalosBranchObjects(branch, branch_config, PLATFORMS, SUITES,
if branch_config['platforms'].get(platform):
slave_platforms = branch_config['platforms'][platform].get(
'slave_platforms', platform_config.get('slave_platforms', []))
+ talos_slave_platforms = branch_config['platforms'][platform].get(
+ 'talos_slave_platforms', platform_config.get('talos_slave_platforms', []))
# Map of # of test runs to builder names
talos_builders = {}
@@ -1826,7 +1828,7 @@ def generateTalosBranchObjects(branch, branch_config, PLATFORMS, SUITES,
elif not platform_config.get('try_by_default', True):
try_default = False
- for slave_platform in slave_platforms:
+ for slave_platform in set(slave_platforms + talos_slave_platforms):
platform_name = platform_config[slave_platform]['name']
# this is to handle how a platform has more than one slave
# platform
@@ -1976,7 +1978,9 @@ def generateTalosBranchObjects(branch, branch_config, PLATFORMS, SUITES,
tinderboxTree].append(pgo_builder['name'])
all_builders.append(pgo_builder['name'])
- if platform in ACTIVE_UNITTEST_PLATFORMS.keys() and branch_config.get('enable_unittests', True):
+ # Skip talos only platforms, not active platforms, branches
+ # with disabled unittests
+ if slave_platform in slave_platforms and platform in ACTIVE_UNITTEST_PLATFORMS.keys() and branch_config.get('enable_unittests', True):
testTypes = []
# unittestSuites are gathered up for each platform from
# config.py
8 process/factory.py
View
@@ -382,7 +382,7 @@ class MozillaBuildFactory(RequestSortingBuildFactory, MockMixin):
def __init__(self, hgHost, repoPath, buildToolsRepoPath, buildSpace=0,
clobberURL=None, clobberBranch=None, clobberTime=None,
buildsBeforeReboot=None, branchName=None, baseWorkDir='build',
- hashType='SHA512', baseMirrorUrls=None, baseBundleUrls=None,
+ hashType='sha512', baseMirrorUrls=None, baseBundleUrls=None,
signingServers=None, enableSigning=True, env={},
balrog_api_root=None, balrog_credentials_file=None,
use_mock=False, mock_target=None,
@@ -5589,7 +5589,7 @@ def pythonWithJson(self, platform):
Return path to a python version that eithers has "simplejson" or
it is 2.6 or higher (which includes the json module)
'''
- if (platform in ("fedora", "fedora64", "ubuntu32", "ubuntu64",
+ if (platform in ("fedora", "fedora64", "ubuntu32_hw", "ubuntu64_hw",
"snowleopard", "lion", "mountainlion")):
return "/tools/buildbot/bin/python"
elif (platform in ('w764', 'win7', 'xp')):
@@ -6042,7 +6042,7 @@ def addSetupSteps(self):
def addPluginInstallSteps(self):
if self.plugins:
# 32 bit (includes mac browsers)
- if self.OS in ('xp', 'win7', 'fedora', 'ubuntu32',
+ if self.OS in ('xp', 'win7', 'fedora', 'ubuntu32_hw',
'tegra_android', 'tegra_android-armv6',
'tegra_android-noion', 'panda_android',
'snowleopard', 'lion', 'mountainlion'):
@@ -6060,7 +6060,7 @@ def addPluginInstallSteps(self):
haltOnFailure=True,
))
# 64 bit
- if self.OS in ('w764', 'fedora64', 'ubuntu64'):
+ if self.OS in ('w764', 'fedora64', 'ubuntu64_hw'):
self.addStep(DownloadFile(
url=WithProperties(
"%s/%s" % (self.supportUrlBase, self.plugins['64'])),
28 process/release.py
View
@@ -1409,6 +1409,33 @@ def getMessageId():
},
})
+ xr_postrelease_factory = ScriptFactory(
+ scriptRepo=tools_repo,
+ scriptName='scripts/release/stage-tasks.sh',
+ extra_args=[branchConfigFile, 'postrelease',
+ '--product', 'xulrunner',
+ '--ssh-user', branchConfig['stage_username_xulrunner'],
+ '--ssh-key', branchConfig['stage_ssh_xulrunner_key'],
+ ],
+ )
+
+ builders.append({
+ 'name': builderPrefix('xr_postrelease'),
+ 'slavenames': unix_slaves,
+ 'category': builderPrefix(''),
+ 'builddir': builderPrefix('xr_postrelease'),
+ 'slavebuilddir': normalizeName(builderPrefix('xr_postrelease')),
+ 'factory': xr_postrelease_factory,
+ 'env': builder_env,
+ 'properties': {
+ 'slavebuilddir': normalizeName(builderPrefix('xr_postrelease')),
+ 'release_config': releaseConfigFile,
+ 'script_repo_revision': releaseTag,
+ 'platform': None,
+ 'branch': 'release-%s' % sourceRepoInfo['name'],
+ },
+ })
+
if not releaseConfig.get('disableBouncerEntries'):
trigger_uptake_factory = BuildFactory()
schedulerNames = [builderPrefix('almost-ready-for-release')]
@@ -1966,3 +1993,4 @@ def getMessageId():
"change_source": change_source,
"schedulers": schedulers,
}
+
2  steps/mobile.py
View
@@ -42,7 +42,7 @@ def createSummary(self, log):
failIdent = "TEST-UNEXPECTED-"
knownIdent = "TEST-KNOWN-FAIL"
- harnessErrorsRe = re.compile(r"TEST-UNEXPECTED-FAIL \| .* \| (Browser crashed \(minidump found\)|missing output line for total leaks!|negative leaks caught!|leaked \d+ bytes during test execution)")
+ harnessErrorsRe = re.compile(r"TEST-UNEXPECTED-FAIL \| .* \| (Browser crashed \(minidump found\)|missing output line for total leaks!|negative leaks caught!|\d+ bytes leaked)")
for line in log.readlines():
m = harnessErrorsRe.match(line)
4 steps/unittest.py
View
@@ -89,7 +89,7 @@ def summarizeLog(name, log, successIdent, failureIdent, otherIdent, infoRe):
# Reuse 'infoRe'.
infoRe = re.compile(infoRe)
# Regular expression for crash and leak detections.
- harnessErrorsRe = re.compile(r"TEST-UNEXPECTED-FAIL \| .* \| (Browser crashed \(minidump found\)|missing output line for total leaks!|negative leaks caught!|leaked \d+ bytes during test execution)")
+ harnessErrorsRe = re.compile(r"TEST-UNEXPECTED-FAIL \| .* \| (Browser crashed \(minidump found\)|missing output line for total leaks!|negative leaks caught!|\d+ bytes leaked)")
# Process the log.
for line in log.readlines():
# Set the counts.
@@ -202,7 +202,7 @@ def summarizeTUnit(name, log):
leaked = False
# Regular expression for crash and leak detections.
- harnessErrorsRe = re.compile(r"TEST-UNEXPECTED-FAIL \| .* \| (missing output line for total leaks!|negative leaks caught!|leaked \d+ bytes during test execution)")
+ harnessErrorsRe = re.compile(r"TEST-UNEXPECTED-FAIL \| .* \| (missing output line for total leaks!|negative leaks caught!|\d+ bytes leaked)")
# Process the log.
for line in log.readlines():
if "TEST-PASS" in line:
4 steps/updates.py
View
@@ -11,7 +11,7 @@
class CreateUpdateSnippet(BuildStep):
def __init__(self, objdir, milestone, baseurl, appendDatedDir=True,
- snippetType='complete', hashType='SHA512', doStepIf=True,
+ snippetType='complete', hashType='sha512', doStepIf=True,
name='create_update_snippet'):
BuildStep.__init__(self, name=name, doStepIf=doStepIf)
@@ -30,7 +30,7 @@ def __init__(self, objdir, milestone, baseurl, appendDatedDir=True,
self.appendDatedDir = appendDatedDir
assert snippetType in ['complete', 'partial']
self.snippetType = snippetType
- assert hashType in ['SHA512']
+ assert hashType in ['sha512']
self.hashType = hashType
self.maxsize = 16384
self.mode = None
Please sign in to comment.
Something went wrong with that request. Please try again.