Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge default->production-0.8

--HG--
branch : production-0.8
  • Loading branch information...
commit bc8e68670834adf70e92c181d07649f2c371b492 2 parents 5f22697 + 3530fda
@jhopkinsmoz jhopkinsmoz authored
Showing with 31 additions and 13 deletions.
  1. +9 −1 env.py
  2. +12 −4 misc.py
  3. +10 −8 process/factory.py
View
10 env.py
@@ -145,7 +145,13 @@
'C:\\cygwin\\bin;' +
'C:\\WINDOWS\\System32;' +
'C:\\program files\\gnuwin32\\bin;' +
- 'C:\\WINDOWS;'
+ 'C:\\WINDOWS;' +
+ 'C:\\mozilla-build\\msys\\bin;' +
+ 'C:\\mozilla-build\\python27;' +
+ 'C:\\mozilla-build\\python27\\Scripts;' +
+ 'C:\\mozilla-build\\info-zip;' +
+ 'C:\\mozilla-build\\wget;' +
+ 'C:\\Program Files (x86)\\GnuWin32\\bin;'
}
MozillaEnvironments['win32-perf-unittest'] = {
@@ -162,6 +168,8 @@
'C:\\mozilla-build\\hg;' +
'C:\\mozilla-build\\7zip;' +
'C:\\mozilla-build\\upx203w;' +
+ 'C:\\mozilla-build\\info-zip;' +
+ 'C:\\mozilla-build\\wget;' +
# Needed for taskkil.exe to find framedyn.dll
'C:\\WINDOWS\\System32\\Wbem;' +
'C:\\WINDOWS\\System32;' +
View
16 misc.py
@@ -663,7 +663,11 @@ def generateBranchObjects(config, name, secrets=None):
}
if secrets is None:
secrets = {}
+ # List of all the per-checkin builders
builders = []
+ # Which builders should we consider when looking at per-checkin results and
+ # determining what revision we should do a nightly build on
+ buildersForNightly = []
buildersByProduct = {}
nightlyBuilders = []
xulrunnerNightlyBuilders = []
@@ -707,6 +711,8 @@ def generateBranchObjects(config, name, secrets=None):
if pf.get('enable_dep', True):
buildername = '%s_dep' % pf['base_name']
builders.append(buildername)
+ if pf.get('consider_for_nightly', True):
+ buildersForNightly.append(buildername)
buildersByProduct.setdefault(
pf['stage_product'], []).append(buildername)
prettyNames[platform] = buildername
@@ -720,12 +726,14 @@ def generateBranchObjects(config, name, secrets=None):
'trystatus': '' if pf.get('try_by_default', True) else 'try-nondefault ',
}
pretty_name = PRETTY_NAME % values
- builder_id = NAME % values
+ buildername = NAME % values
if pf.get('enable_dep', True):
- builders.append(builder_id)
+ builders.append(buildername)
+ if pf.get('consider_for_nightly', True):
+ buildersForNightly.append(buildername)
buildersByProduct.setdefault(
- pf['stage_product'], []).append(builder_id)
+ pf['stage_product'], []).append(buildername)
prettyNames[platform] = pretty_name
# Fill the l10n dep dict
@@ -936,7 +944,7 @@ def generateBranchObjects(config, name, secrets=None):
if config.get('enable_nightly_lastgood', True):
goodFunc = lastGoodFunc(
branch=config['repo_path'],
- builderNames=builders,
+ builderNames=buildersForNightly,
triggerBuildIfNoChanges=False,
l10nBranch=config.get('l10n_repo_path')
)
View
18 process/factory.py
@@ -377,7 +377,7 @@ def addMockSteps(self):
class MozillaBuildFactory(RequestSortingBuildFactory, MockMixin):
- ignore_dirs = ['info', 'rel-*']
+ ignore_dirs = ['info', 'rel-*', 'tb-rel-*']
def __init__(self, hgHost, repoPath, buildToolsRepoPath, buildSpace=0,
clobberURL=None, clobberBranch=None, clobberTime=None,
@@ -4933,7 +4933,7 @@ def addSetupSteps(self):
if self.platform.startswith('win32'):
self.addStep(ShellCommand(
name='run mouse & screen adjustment script',
- command=['C:\\mozilla-build\\python25\\python.exe',
+ command=['python.exe',
WithProperties('%(toolsdir)s/scripts/support/mouse_and_screen_resolution.py'),
'--configuration-url',
WithProperties("http://%s/%s" % (self.hgHost, self.repoPath) +
@@ -5547,6 +5547,8 @@ def pythonWithJson(self, platform):
return "/tools/buildbot/bin/python"
elif (platform in ('w764', 'win7', 'xp')):
return "C:\\mozilla-build\\python25\\python.exe"
+ elif (platform in ('win8',)):
+ return "C:\\mozilla-build\\python27\\python.exe"
elif (platform.find("android") > -1):
# path in the foopies
return "/usr/local/bin/python2.6"
@@ -5574,7 +5576,7 @@ def addMobileCleanupSteps(self):
))
def addCleanupSteps(self):
- if self.OS in ('xp', 'vista', 'win7', 'w764'):
+ if self.OS in ('xp', 'win7', 'w764'):
# required step due to long filename length in tp4
self.addStep(ShellCommand(
name='mv tp4',
@@ -5710,7 +5712,7 @@ def get_robocop_url(build):
))
def addUnpackBuildSteps(self):
- if (self.releaseTester and (self.OS in ('xp', 'vista', 'win7', 'w764'))):
+ if (self.releaseTester and (self.OS in ('xp', 'win7', 'w764'))):
# build is packaged in a windows installer
self.addStep(DownloadFile(
url=WithProperties("%s/tools/buildfarm/utils/firefoxInstallConfig.ini" % self.supportUrlBase),
@@ -5746,7 +5748,7 @@ def addUnpackBuildSteps(self):
name="Unpack build",
haltOnFailure=True,
))
- if self.OS in ('xp', 'vista', 'win7', 'w764'):
+ if self.OS in ('xp', 'win7', 'w764'):
self.addStep(ShellCommand(
name='chmod_files',
workdir=os.path.join(
@@ -5766,7 +5768,7 @@ def addUnpackBuildSteps(self):
property_name="exepath",
name="Find executable",
))
- elif self.OS in ('xp', 'vista', 'win7', 'w764'):
+ elif self.OS in ('xp', 'win7', 'w764', 'win8'):
self.addStep(SetBuildProperty(
property_name="exepath",
value="../%s/%s" % (
@@ -5993,7 +5995,7 @@ def addSetupSteps(self):
def addPluginInstallSteps(self):
if self.plugins:
# 32 bit (includes mac browsers)
- if self.OS in ('xp', 'vista', 'win7', 'fedora', 'ubuntu32',
+ if self.OS in ('xp', 'win7', 'fedora', 'ubuntu32',
'tegra_android', 'tegra_android-armv6',
'tegra_android-noion', 'panda_android',
'snowleopard', 'lion', 'mountainlion'):
@@ -6489,7 +6491,7 @@ def __init__(self, scriptRepo, scriptName, cwd=None, interpreter=None,
self.get_basedir_cmd = ['bash', '-c', 'pwd']
self.env = env.copy()
if platform and 'win' in platform:
- self.get_basedir_cmd = ['cmd', '/C', 'pwd']
+ self.get_basedir_cmd = ['cd']
if scriptName[0] == '/':
script_path = scriptName
else:
Please sign in to comment.
Something went wrong with that request. Please try again.