Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge from default

changeset:   2511:78777283f1a2
parent:      2504:135615b11cd2
user:        Kim Moir <kmoir@mozilla.com>
date:        Thu Aug 09 12:56:00 2012 -0400
summary:     Bug 777759 - buildbot config changes to support Mountain Lion r=coop

changeset:   2512:05b1d1315919
tag:         tip
user:        Justin Wood <Callek@gmail.com>
date:        Fri Aug 10 03:18:34 2012 -0400
summary:     Bug 726176 - setup linux foopy to test running clientproxy on. r=coop

--HG--
branch : production-0.8
  • Loading branch information...
commit 6cf46cee4289ebc1a1845253662f6de718a96ef6 2 parents 7fb701d + 64b4315
@rail rail authored
Showing with 14 additions and 9 deletions.
  1. +14 −9 process/factory.py
View
23 process/factory.py
@@ -5176,7 +5176,7 @@ def __init__(self, platform, suites, hostUtils, productName='fennec',
downloadSymbols=False, downloadTests=True, posixBinarySuffix='',
remoteExtras=None, branchName=None, **kwargs):
self.suites = suites
- self.hostUtils = hostUtils
+ self.hostUtils = WithProperties(hostUtils)
if remoteExtras is not None:
self.remoteExtras = remoteExtras
@@ -5224,6 +5224,11 @@ def addInitialSteps(self):
workdir='build',
haltOnFailure=True,
))
+ self.addStep(SetProperty(
+ name="GetFoopyPlatform",
+ command=['bash', '-c', 'uname -s'],
+ property='foopy_type'
+ ))
def addSetupSteps(self):
self.addStep(DownloadFile(
@@ -5509,13 +5514,13 @@ 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", "leopard", "snowleopard", "lion")):
+ if (platform in ("fedora", "fedora64", "leopard", "snowleopard", "lion", "mountainlion")):
return "/tools/buildbot/bin/python"
elif (platform in ('w764', 'win7', 'xp')):
return "C:\\mozilla-build\\python25\\python.exe"
elif (platform.find("android") > -1):
# path in the foopies
- return "/opt/local/bin/python"
+ return "/usr/local/bin/python2.6"
else:
raise ValueError("No valid platform was passed: %s" % platform)
@@ -5622,7 +5627,7 @@ def addCleanupSteps(self):
def addDmgInstaller(self):
- if self.OS in ('leopard', 'tiger', 'snowleopard', 'lion'):
+ if self.OS in ('leopard', 'tiger', 'snowleopard', 'lion', 'mountainlion'):
self.addStep(DownloadFile(
url=WithProperties("%s/tools/buildfarm/utils/installdmg.sh" % self.supportUrlBase),
workdir=self.workdirBase,
@@ -5719,7 +5724,7 @@ def addUnpackBuildSteps(self):
command=["chmod", "-v", "-R", "a+x", "."],
env=self.env)
)
- if self.OS in ('tiger', 'leopard', 'snowleopard', 'lion'):
+ if self.OS in ('tiger', 'leopard', 'snowleopard', 'lion', 'mountainlion'):
self.addStep(FindFile(
workdir=os.path.join(self.workdirBase, "talos"),
filename="%s-bin" % self.productName,
@@ -5927,7 +5932,7 @@ def addSetupSteps(self):
def addPluginInstallSteps(self):
if self.plugins:
#32 bit (includes mac browsers)
- if self.OS in ('xp', 'vista', 'win7', 'fedora', 'tegra_android', 'leopard', 'snowleopard', 'leopard-o', 'lion'):
+ if self.OS in ('xp', 'vista', 'win7', 'fedora', 'tegra_android', 'leopard', 'snowleopard', 'leopard-o', 'lion', 'mountainlion'):
self.addStep(DownloadFile(
url=WithProperties("%s/%s" % (self.supportUrlBase, self.plugins['32'])),
workdir=os.path.join(self.workdirBase, "talos/base_profile"),
@@ -6035,7 +6040,7 @@ def addUpdateConfigStep(self):
)
def addRunTestStep(self):
- if self.OS in ('lion', 'snowleopard'):
+ if self.OS in ('mountainlion', 'lion', 'snowleopard'):
self.addStep(resolution_step())
self.addStep(talos_steps.MozillaRunPerfTests(
warnOnWarnings=True,
@@ -6046,11 +6051,11 @@ def addRunTestStep(self):
command=self.talosCmd,
env=self.env)
)
- if self.OS in ('lion', 'snowleopard'):
+ if self.OS in ('mountainlion', 'lion', 'snowleopard'):
self.addStep(resolution_step())
def addRebootStep(self):
- if self.OS in ('lion',):
+ if self.OS in ('mountainlion', 'lion',):
self.addStep(ShellCommand(
name="clear_saved_state",
flunkOnFailure=False,
Please sign in to comment.
Something went wrong with that request. Please try again.