Skip to content
This repository has been archived by the owner on Jun 11, 2019. It is now read-only.

Commit

Permalink
merged from default
Browse files Browse the repository at this point in the history 
changeset:   2632:1dcb5a52484e
parent:      2630:31291093d27d
user:        Justin Wood <callek@mozilla.com>
date:        Fri Apr 13 17:58:31 2012 -0400
summary:     Bug 744958 - we download updateSUT.py to updateSUT.py.x, then execute updateSUT.py. r=bear

changeset:   2633:a26ac343141d
user:        Justin Wood <Callek@gmail.com>
date:        Fri Apr 13 18:18:02 2012 -0400
summary:     Bug 744958 - fix typo. rs=aki

changeset:   2634:2558c57ddca5
user:        Rail Aliiev <rail@mozilla.com>
date:        Mon Apr 16 08:27:46 2012 -0400
summary:     Bug 741751 - Installer for Partner Repack for Firefox 11 are not signed. r=coop

changeset:   2635:57c563fd8024
user:        John Hopkins <jhopkins@mozilla.com>
date:        Mon Apr 16 14:09:55 2012 -0400
summary:     Bug 745538 - Port mozmill test steps from Thunderbird's buildbotcustom to production buildbotcustom. r=bhearsum

changeset:   2636:b375f14334ea
user:        Phil Ringnalda <philringnalda@gmail.com>
date:        Mon Apr 16 13:05:39 2012 -0700
summary:     Bug 745469 - Turn off Tinderbox email for Spidermonkey builds, r=catlee

changeset:   2637:ca08506c9ab3
user:        Armen Zambrano Gasparnian <armenzg@mozilla.com>
date:        Mon Apr 16 16:48:08 2012 -0400
summary:     Bug 729392 - Setting MOZ_NODE_PATH for linux testers. r=coop

changeset:   2638:f40fec804a5e
tag:         tip
user:        Armen Zambrano Gasparnian <armenzg@mozilla.com>
date:        Mon Apr 16 17:35:06 2012 -0400
summary:     (backout) Setting MOZ_NODE_PATH for linux testers.

--HG--
branch : production-0.8
  • Loading branch information
Chris AtLee committed Apr 17, 2012
2 parents 9f0a775 + 5953aa2 commit 1b628b8
Show file tree
Hide file tree
Showing 2 changed files with 85 additions and 51 deletions.
15 changes: 0 additions & 15 deletions misc.py
View file
Expand Up @@ -3643,24 +3643,9 @@ def isImportant(change):
fileIsImportant=isImportant,
)

# Tinderbox notifier
status = []
if not config.get("disable_tinderbox_mail"):
tbox_mailer = TinderboxMailNotifier(
fromaddr="mozilla2.buildbot@build.mozilla.org",
tree=config['tinderbox_tree'],
extraRecipients=["tinderbox-daemon@tinderbox.mozilla.org"],
relayhost="mail.build.mozilla.org",
builders=[b['name'] for b in builders],
logCompression="gzip",
errorparser="unittest"
)
status = [tbox_mailer]

return {
'builders': builders,
'schedulers': [scheduler],
'status': status,
}

def generateJetpackObjects(config, SLAVES):
Expand Down
121 changes: 85 additions & 36 deletions process/factory.py
View file
Expand Up @@ -7112,44 +7112,91 @@ def addRunTestSteps(self):
maxTime=2*60*60, # Two Hours
))
elif suite == 'mozmill':

# Unpack the tests
MOZMILL_VIRTUALENV_DIR = os.path.join('..', 'mozmill-virtualenv')
mozmill_env = self.env.copy()
mozmill_env['MOZMILL_NO_VNC'] = "1"
mozmill_env['NO_EM_RESTART'] = "0"
mozmill_env['MOZMILL_RICH_FAILURES'] = "1"

# Workaround for Mozrunner bug 575863.
if 'LD_LIBRARY_PATH' in mozmill_env:
mozmill_env['LD_LIBRARY_PATH'] = WithProperties("../%(exedir)s")

# Find the application app bundle, workaround for mozmill on OS X
#XXX
self.brandName = "Shredder"
if self.platform.startswith('macosx'):
self.addStep(SetProperty(
name='Find executable .app',
command=['bash', '-c', WithProperties('echo %(exedir)s | cut -d/ -f1-2') ],
property='exepath',
workdir='.',
))
self.addStep(UnpackTest(
filename=WithProperties('%(tests_filename)s'),
testtype='mozmill',
haltOnFailure=True,
name='unpack mochitest tests',
name='unpack mozmill tests',
))
self.addStep(ShellCommand(
name='install plugins',
command=['sh', '-c', WithProperties('if [ ! -d %(exedir)s/plugins ]; then mkdir %(exedir)s/plugins; fi && cp -R bin/plugins/* %(exedir)s/plugins/')],
haltOnFailure=True,
))

# Older comm-central branches use a centrally-installed
# MozMill. We figure this out by seeing if installmozmill.py is
# present.
self.addStep(SetProperty(
name='check mozmill virtualenv setup',
property='mozmillVirtualenvSetup',
command=['bash', '-c', 'test -e installmozmill.py && ls installmozmill.py'],
workdir='build/mozmill/resources',
flunkOnFailure=False,
haltOnFailure=False,
warnOnFailure=False
))
def isVirtualenvSetup(step):
return (step.build.getProperties().has_key("mozmillVirtualenvSetup") and
len(step.build.getProperty("mozmillVirtualenvSetup")) > 0)

# We want to use system python on non-Windows
virtualenv_python = 'python' if self.platform.startswith('win') else '/usr/bin/python'

# install mozmill into its virtualenv
self.addStep(ShellCommand(
name='install mozmill',
command=['python',
'mozmill/installmozmill.py'],
flunkOnFailure=True,
haltOnFailure=True,
))
name='setup virtualenv',
command=[virtualenv_python, 'resources/installmozmill.py',
MOZMILL_VIRTUALENV_DIR],
doStepIf=isVirtualenvSetup,
flunkOnFailure=True,
haltOnFailure=True,
workdir='build/mozmill'
))
bindir = 'Scripts' if self.platform.startswith('win') else 'bin'

# PYTHONHOME overrides virtualenv install directories, so get rid of it
mozmill_virtualenv_env = mozmill_env.copy()
mozmill_virtualenv_env['PYTHONHOME'] = None

mozmillpython = os.path.join(MOZMILL_VIRTUALENV_DIR, bindir, 'python')
self.addStep(unittest_steps.MozillaCheck,
test_name="mozmill virtualenv",
warnOnWarnings=True,
command = ['bash', '-c', WithProperties(mozmillpython + ' runtestlist.py --binary=../%(exepath)s --symbols-path=../symbols --list=mozmilltests.list')],
doStepIf=isVirtualenvSetup,
env=mozmill_virtualenv_env,
workdir='build/mozmill',
)
# ... and add another step for older branches, run if the above isn't
self.addStep(unittest_steps.MozillaCheck,
test_name="mozmill legacy",
warnOnWarnings=True,
command=['python', 'runtestlist.py', WithProperties('--binary=../%(exepath)s') ,'--symbols-path=../symbols','--list=mozmilltests.list'],
doStepIf=lambda step: not isVirtualenvSetup(step),
env=mozmill_env,
workdir='build/mozmill',
)

# run the mozmill tests
self.addStep(unittest_steps.MozillaPackagedMozmillTests(
name="run_mozmill",
tests_dir='tests/firefox',
binary='../%(exepath)s',
platform=self.platform,
workdir='build/mozmill',
timeout=10*60,
flunkOnFailure=True
))
self.addStep(unittest_steps.MozillaPackagedMozmillTests(
name="run_mozmill_restart",
tests_dir='tests/firefox/restartTests',
binary='../%(exepath)s',
platform=self.platform,
restart=True,
workdir='build/mozmill',
timeout=5*60,
flunkOnFailure=True
))
if self.platform.startswith('macosx64'):
self.addStep(resolution_step())

Expand Down Expand Up @@ -7203,23 +7250,23 @@ def addInitialSteps(self):
self.addStep(RetryingShellCommand(
name='get_device_manager_py',
description="Download devicemanager.py",
command=['wget', '--no-check-certificate',
command=['wget', '--no-check-certificate', '-O', 'devicemanager.py',
'http://hg.mozilla.org/build/talos/raw-file/2f75acc0f8f2/talos/devicemanager.py'],
workdir='build',
haltOnFailure=True,
))
self.addStep(RetryingShellCommand(
name='get_device_manager_SUT_py',
description="Download devicemanagerSUT.py",
command=['wget', '--no-check-certificate',
command=['wget', '--no-check-certificate', '-O', 'devicemanagerSUT.py',
'http://hg.mozilla.org/build/talos/raw-file/6e5f5cadd9e9/talos/devicemanagerSUT.py'],
workdir='build',
haltOnFailure=True,
))
self.addStep(RetryingShellCommand(
name='get_updateSUT_py',
description="Download updateSUT.py",
command=['wget', '--no-check-certificate',
command=['wget', '--no-check-certificate', '-O', 'updateSUT.py',
'http://hg.mozilla.org/build/tools/raw-file/eba35f2aeabd/sut_tools/updateSUT.py'],
workdir='build',
haltOnFailure=True,
Expand Down Expand Up @@ -7880,22 +7927,22 @@ def addSetupSteps(self):
self.addStep(RetryingShellCommand(
name='get_device_manager_py',
description="Download devicemanager.py",
command=['wget', '--no-check-certificate',
command=['wget', '--no-check-certificate', '-O', 'devicemanager.py',
'http://hg.mozilla.org/build/talos/raw-file/2f75acc0f8f2/talos/devicemanager.py'],
workdir=self.workdirBase,
haltOnFailure=True,
))
self.addStep(RetryingShellCommand(
name='get_device_manager_SUT_py',
description="Download devicemanagerSUT.py",
command=['wget', '--no-check-certificate',
command=['wget', '--no-check-certificate', '-O', 'devicemanagerSUT.py',
'http://hg.mozilla.org/build/talos/raw-file/6e5f5cadd9e9/talos/devicemanagerSUT.py'],
workdir=self.workdirBase,
haltOnFailure=True,
))
self.addStep(RetryingShellCommand(
name='get_updateSUT_py',
command=['wget', '--no-check-certificate',
command=['wget', '--no-check-certificate', '-O', 'updateSUT.py',
'http://hg.mozilla.org/build/tools/raw-file/eba35f2aeabd/sut_tools/updateSUT.py'],
workdir=self.workdirBase,
haltOnFailure=True,
Expand Down Expand Up @@ -8401,6 +8448,8 @@ def doPartnerRepacks(self):
command=[self.python, './partner-repacks.py',
'--version', str(self.version),
'--build-number', str(self.buildNumber),
'--repo', self.repoPath,
'--hgroot', 'http://%s' % self.hgHost,
'--staging-server', self.stagingServer,
'--dmg-extract-script',
WithProperties('%(toolsdir)s/release/common/unpack-diskimage.sh'),
Expand Down

0 comments on commit 1b628b8

Please sign in to comment.