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

Commit

Permalink
Browse files Browse the repository at this point in the history
Merging from default\n
changeset:   1554:7879c8194cd2
parent:      1552:24f94a05d482
user:        Chris Cooper <ccooper@deadsquid.com>
date:        Thu May 26 10:00:52 2011 -0400
summary:     Bug 658855 - Checkout configs under a separate dir - r=nthomas

changeset:   1555:3f888fb91eda
tag:         tip
user:        Mike Taylor <bear@mozilla.com>
date:        Thu May 26 12:18:09 2011 -0400
summary:     bug 656371 r=aki add remoteProcessName to talos config for m-a and m-b runs

--HG--
branch : production-0.8
  • Loading branch information
Mike Taylor committed May 26, 2011
2 parents 56b63bb + 4ab983a commit 68a2f75
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 21 deletions.
1 change: 1 addition & 0 deletions misc.py
Expand Up @@ -2468,6 +2468,7 @@ def generateTalosBranchObjects(branch, branch_config, PLATFORMS, SUITES,
workdirBase="../talos-data", workdirBase="../talos-data",
buildBranch=buildBranch, buildBranch=buildBranch,
branchName=branchName, branchName=branchName,
branch=branch,
talosBranch=talosBranch, talosBranch=talosBranch,
configOptions=talosConfig, configOptions=talosConfig,
talosCmd=talosCmd, talosCmd=talosCmd,
Expand Down
19 changes: 10 additions & 9 deletions process/factory.py
Expand Up @@ -4093,31 +4093,31 @@ def addConfigSteps(self, workdir='build'):
description=['removing', 'configs'], description=['removing', 'configs'],
descriptionDone=['remove', 'configs'], descriptionDone=['remove', 'configs'],
haltOnFailure=True, haltOnFailure=True,
workdir=workdir workdir='.'
) )
self.addStep(MercurialCloneCommand, self.addStep(MercurialCloneCommand,
name='hg_clone_configs', name='hg_clone_configs',
command=['hg', 'clone', configRepo, 'configs'], command=['hg', 'clone', configRepo, 'configs'],
description=['checking', 'out', 'configs'], description=['checking', 'out', 'configs'],
descriptionDone=['checkout', 'configs'], descriptionDone=['checkout', 'configs'],
haltOnFailure=True, haltOnFailure=True,
workdir=workdir workdir='.'
) )
self.addStep(ShellCommand, self.addStep(ShellCommand,
name='hg_update', name='hg_update',
command=['hg', 'update', '-r', self.mozconfigBranch], command=['hg', 'update', '-r', self.mozconfigBranch],
description=['updating', 'mozconfigs'], description=['updating', 'mozconfigs'],
haltOnFailure=True, haltOnFailure=True,
workdir="%s/configs" % workdir workdir='./configs'
) )
self.addStep(ShellCommand, self.addStep(ShellCommand,
# cp configs/mozilla2/$platform/$repo/$type/mozconfig .mozconfig # cp configs/mozilla2/$platform/$repo/$type/mozconfig .mozconfig
name='cp_mozconfig', name='cp_mozconfig',
command=['cp', self.mozconfig, '.mozconfig'], command=['cp', self.mozconfig, '%s/.mozconfig' % workdir],
description=['copying', 'mozconfig'], description=['copying', 'mozconfig'],
descriptionDone=['copy', 'mozconfig'], descriptionDone=['copy', 'mozconfig'],
haltOnFailure=True, haltOnFailure=True,
workdir=workdir workdir='.'
) )
self.addStep(ShellCommand, self.addStep(ShellCommand,
name='cat_mozconfig', name='cat_mozconfig',
Expand Down Expand Up @@ -7500,7 +7500,7 @@ def __init__(self, OS, supportUrlBase, envName, buildBranch, branchName,
workdirBase=None, fetchSymbols=False, plugins=None, pageset=None, workdirBase=None, fetchSymbols=False, plugins=None, pageset=None,
remoteTests=False, productName="firefox", remoteExtras=None, remoteTests=False, productName="firefox", remoteExtras=None,
talosAddOns=[], addonTester=False, releaseTester=False, talosAddOns=[], addonTester=False, releaseTester=False,
talosBranch=None): talosBranch=None, branch=None):


BuildFactory.__init__(self) BuildFactory.__init__(self)


Expand Down Expand Up @@ -7539,8 +7539,8 @@ def __init__(self, OS, supportUrlBase, envName, buildBranch, branchName,
exePaths = self.remoteExtras.get('processName', {}) exePaths = self.remoteExtras.get('processName', {})
else: else:
exePaths = {} exePaths = {}
if branchName in exePaths: if branch in exePaths:
self.remoteProcessName = exePaths[branchName] self.remoteProcessName = exePaths[branch]
else: else:
if 'default' in exePaths: if 'default' in exePaths:
self.remoteProcessName = exePaths['default'] self.remoteProcessName = exePaths['default']
Expand Down Expand Up @@ -7996,7 +7996,8 @@ def addUpdateConfigStep(self):
extName=TalosFactory.extName, extName=TalosFactory.extName,
addonTester=self.addonTester, addonTester=self.addonTester,
useSymbols=self.fetchSymbols, useSymbols=self.fetchSymbols,
remoteExtras=self.remoteExtras) remoteExtras=self.remoteExtras,
remoteProcessName=self.remoteProcessName)
) )


def addRunTestStep(self): def addRunTestStep(self):
Expand Down
18 changes: 6 additions & 12 deletions steps/talos.py
Expand Up @@ -10,7 +10,8 @@ class MozillaUpdateConfig(ShellCommand):


def __init__(self, branch, branchName, executablePath, def __init__(self, branch, branchName, executablePath,
addOptions=None, useSymbols=False, addonTester=False, addOptions=None, useSymbols=False, addonTester=False,
remoteTests=False, extName=None, remoteExtras=None, **kwargs): remoteTests=False, extName=None, remoteExtras=None,
remoteProcessName=None, **kwargs):


if addOptions is None: if addOptions is None:
self.addOptions = [] self.addOptions = []
Expand All @@ -22,15 +23,7 @@ def __init__(self, branch, branchName, executablePath,
else: else:
self.remoteExtras = {} self.remoteExtras = {}


exePaths = self.remoteExtras.get('processName', {}) self.remoteProcessName = remoteProcessName
if branch in exePaths:
self.remoteExePath = exePaths[branch]
else:
if 'default' in exePaths:
self.remoteExePath = exePaths['default']
else:
self.remoteExePath = 'org.mozilla.fennec'

self.remoteOptions = self.remoteExtras.get('options', []) self.remoteOptions = self.remoteExtras.get('options', [])


self.branch = branch self.branch = branch
Expand All @@ -48,7 +41,8 @@ def __init__(self, branch, branchName, executablePath,
branchName=branchName, executablePath=executablePath, branchName=branchName, executablePath=executablePath,
remoteTests=remoteTests, useSymbols=useSymbols, remoteTests=remoteTests, useSymbols=useSymbols,
extName=extName, addonTester=addonTester, extName=extName, addonTester=addonTester,
remoteExtras=self.remoteExtras) remoteExtras=self.remoteExtras,
remoteProcessName=remoteProcessName)


def setBuild(self, build): def setBuild(self, build):
self.super_class.setBuild(self, build) self.super_class.setBuild(self, build)
Expand All @@ -64,7 +58,7 @@ def setBuild(self, build):
self.addOptions += ['--symbolsPath', '../symbols'] self.addOptions += ['--symbolsPath', '../symbols']


if self.remoteTests: if self.remoteTests:
exePath = self.remoteExePath exePath = self.remoteProcessName
perfconfigurator = "remotePerfConfigurator.py" perfconfigurator = "remotePerfConfigurator.py"
self.addOptions += ['--remoteDevice', WithProperties('%(sut_ip)s'), ] self.addOptions += ['--remoteDevice', WithProperties('%(sut_ip)s'), ]
self.addOptions += self.remoteOptions self.addOptions += self.remoteOptions
Expand Down

0 comments on commit 68a2f75

Please sign in to comment.