Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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...
commit 68a2f7552111a435c6beea2b9adc694de2dd626c 2 parents 56b63bb + 4ab983a
Mike Taylor authored
Showing with 17 additions and 21 deletions.
  1. +1 −0  misc.py
  2. +10 −9 process/factory.py
  3. +6 −12 steps/talos.py
View
1  misc.py
@@ -2468,6 +2468,7 @@ def generateTalosBranchObjects(branch, branch_config, PLATFORMS, SUITES,
workdirBase="../talos-data",
buildBranch=buildBranch,
branchName=branchName,
+ branch=branch,
talosBranch=talosBranch,
configOptions=talosConfig,
talosCmd=talosCmd,
View
19 process/factory.py
@@ -4093,7 +4093,7 @@ def addConfigSteps(self, workdir='build'):
description=['removing', 'configs'],
descriptionDone=['remove', 'configs'],
haltOnFailure=True,
- workdir=workdir
+ workdir='.'
)
self.addStep(MercurialCloneCommand,
name='hg_clone_configs',
@@ -4101,23 +4101,23 @@ def addConfigSteps(self, workdir='build'):
description=['checking', 'out', 'configs'],
descriptionDone=['checkout', 'configs'],
haltOnFailure=True,
- workdir=workdir
+ workdir='.'
)
self.addStep(ShellCommand,
name='hg_update',
command=['hg', 'update', '-r', self.mozconfigBranch],
description=['updating', 'mozconfigs'],
haltOnFailure=True,
- workdir="%s/configs" % workdir
+ workdir='./configs'
)
self.addStep(ShellCommand,
# cp configs/mozilla2/$platform/$repo/$type/mozconfig .mozconfig
name='cp_mozconfig',
- command=['cp', self.mozconfig, '.mozconfig'],
+ command=['cp', self.mozconfig, '%s/.mozconfig' % workdir],
description=['copying', 'mozconfig'],
descriptionDone=['copy', 'mozconfig'],
haltOnFailure=True,
- workdir=workdir
+ workdir='.'
)
self.addStep(ShellCommand,
name='cat_mozconfig',
@@ -7500,7 +7500,7 @@ def __init__(self, OS, supportUrlBase, envName, buildBranch, branchName,
workdirBase=None, fetchSymbols=False, plugins=None, pageset=None,
remoteTests=False, productName="firefox", remoteExtras=None,
talosAddOns=[], addonTester=False, releaseTester=False,
- talosBranch=None):
+ talosBranch=None, branch=None):
BuildFactory.__init__(self)
@@ -7539,8 +7539,8 @@ def __init__(self, OS, supportUrlBase, envName, buildBranch, branchName,
exePaths = self.remoteExtras.get('processName', {})
else:
exePaths = {}
- if branchName in exePaths:
- self.remoteProcessName = exePaths[branchName]
+ if branch in exePaths:
+ self.remoteProcessName = exePaths[branch]
else:
if 'default' in exePaths:
self.remoteProcessName = exePaths['default']
@@ -7996,7 +7996,8 @@ def addUpdateConfigStep(self):
extName=TalosFactory.extName,
addonTester=self.addonTester,
useSymbols=self.fetchSymbols,
- remoteExtras=self.remoteExtras)
+ remoteExtras=self.remoteExtras,
+ remoteProcessName=self.remoteProcessName)
)
def addRunTestStep(self):
View
18 steps/talos.py
@@ -10,7 +10,8 @@ class MozillaUpdateConfig(ShellCommand):
def __init__(self, branch, branchName, executablePath,
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:
self.addOptions = []
@@ -22,15 +23,7 @@ def __init__(self, branch, branchName, executablePath,
else:
self.remoteExtras = {}
- exePaths = self.remoteExtras.get('processName', {})
- if branch in exePaths:
- self.remoteExePath = exePaths[branch]
- else:
- if 'default' in exePaths:
- self.remoteExePath = exePaths['default']
- else:
- self.remoteExePath = 'org.mozilla.fennec'
-
+ self.remoteProcessName = remoteProcessName
self.remoteOptions = self.remoteExtras.get('options', [])
self.branch = branch
@@ -48,7 +41,8 @@ def __init__(self, branch, branchName, executablePath,
branchName=branchName, executablePath=executablePath,
remoteTests=remoteTests, useSymbols=useSymbols,
extName=extName, addonTester=addonTester,
- remoteExtras=self.remoteExtras)
+ remoteExtras=self.remoteExtras,
+ remoteProcessName=remoteProcessName)
def setBuild(self, build):
self.super_class.setBuild(self, build)
@@ -64,7 +58,7 @@ def setBuild(self, build):
self.addOptions += ['--symbolsPath', '../symbols']
if self.remoteTests:
- exePath = self.remoteExePath
+ exePath = self.remoteProcessName
perfconfigurator = "remotePerfConfigurator.py"
self.addOptions += ['--remoteDevice', WithProperties('%(sut_ip)s'), ]
self.addOptions += self.remoteOptions
Please sign in to comment.
Something went wrong with that request. Please try again.