Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
authored May 26, 2011
1  misc.py
@@ -2468,6 +2468,7 @@ def generateTalosBranchObjects(branch, branch_config, PLATFORMS, SUITES,
2468 2468
                         workdirBase="../talos-data",
2469 2469
                         buildBranch=buildBranch,
2470 2470
                         branchName=branchName,
  2471
+                        branch=branch,
2471 2472
                         talosBranch=talosBranch,
2472 2473
                         configOptions=talosConfig,
2473 2474
                         talosCmd=talosCmd,
19  process/factory.py
@@ -4093,7 +4093,7 @@ def addConfigSteps(self, workdir='build'):
4093 4093
                      description=['removing', 'configs'],
4094 4094
                      descriptionDone=['remove', 'configs'],
4095 4095
                      haltOnFailure=True,
4096  
-                     workdir=workdir
  4096
+                     workdir='.'
4097 4097
         )
4098 4098
         self.addStep(MercurialCloneCommand,
4099 4099
                      name='hg_clone_configs',
@@ -4101,23 +4101,23 @@ def addConfigSteps(self, workdir='build'):
4101 4101
                      description=['checking', 'out', 'configs'],
4102 4102
                      descriptionDone=['checkout', 'configs'],
4103 4103
                      haltOnFailure=True,
4104  
-                     workdir=workdir
  4104
+                     workdir='.'
4105 4105
         )
4106 4106
         self.addStep(ShellCommand,
4107 4107
                      name='hg_update',
4108 4108
                      command=['hg', 'update', '-r', self.mozconfigBranch],
4109 4109
                      description=['updating', 'mozconfigs'],
4110 4110
                      haltOnFailure=True,
4111  
-                     workdir="%s/configs" % workdir
  4111
+                     workdir='./configs'
4112 4112
         )
4113 4113
         self.addStep(ShellCommand,
4114 4114
                      # cp configs/mozilla2/$platform/$repo/$type/mozconfig .mozconfig
4115 4115
                      name='cp_mozconfig',
4116  
-                     command=['cp', self.mozconfig, '.mozconfig'],
  4116
+                     command=['cp', self.mozconfig, '%s/.mozconfig' % workdir],
4117 4117
                      description=['copying', 'mozconfig'],
4118 4118
                      descriptionDone=['copy', 'mozconfig'],
4119 4119
                      haltOnFailure=True,
4120  
-                     workdir=workdir
  4120
+                     workdir='.'
4121 4121
         )
4122 4122
         self.addStep(ShellCommand,
4123 4123
                      name='cat_mozconfig',
@@ -7500,7 +7500,7 @@ def __init__(self, OS, supportUrlBase, envName, buildBranch, branchName,
7500 7500
             workdirBase=None, fetchSymbols=False, plugins=None, pageset=None,
7501 7501
             remoteTests=False, productName="firefox", remoteExtras=None,
7502 7502
             talosAddOns=[], addonTester=False, releaseTester=False,
7503  
-            talosBranch=None):
  7503
+            talosBranch=None, branch=None):
7504 7504
 
7505 7505
         BuildFactory.__init__(self)
7506 7506
 
@@ -7539,8 +7539,8 @@ def __init__(self, OS, supportUrlBase, envName, buildBranch, branchName,
7539 7539
             exePaths = self.remoteExtras.get('processName', {})
7540 7540
         else:
7541 7541
             exePaths = {}
7542  
-        if branchName in exePaths:
7543  
-            self.remoteProcessName = exePaths[branchName]
  7542
+        if branch in exePaths:
  7543
+            self.remoteProcessName = exePaths[branch]
7544 7544
         else:
7545 7545
             if 'default' in exePaths:
7546 7546
                 self.remoteProcessName = exePaths['default']
@@ -7996,7 +7996,8 @@ def addUpdateConfigStep(self):
7996 7996
          extName=TalosFactory.extName,
7997 7997
          addonTester=self.addonTester,
7998 7998
          useSymbols=self.fetchSymbols,
7999  
-         remoteExtras=self.remoteExtras)
  7999
+         remoteExtras=self.remoteExtras,
  8000
+         remoteProcessName=self.remoteProcessName)
8000 8001
         )
8001 8002
 
8002 8003
     def addRunTestStep(self):
18  steps/talos.py
@@ -10,7 +10,8 @@ class MozillaUpdateConfig(ShellCommand):
10 10
 
11 11
     def __init__(self, branch, branchName, executablePath,
12 12
             addOptions=None, useSymbols=False, addonTester=False,
13  
-            remoteTests=False, extName=None, remoteExtras=None, **kwargs):
  13
+            remoteTests=False, extName=None, remoteExtras=None,
  14
+            remoteProcessName=None, **kwargs):
14 15
 
15 16
         if addOptions is None:
16 17
             self.addOptions = []
@@ -22,15 +23,7 @@ def __init__(self, branch, branchName, executablePath,
22 23
         else:
23 24
             self.remoteExtras = {}
24 25
 
25  
-        exePaths = self.remoteExtras.get('processName', {})
26  
-        if branch in exePaths:
27  
-            self.remoteExePath = exePaths[branch]
28  
-        else:
29  
-            if 'default' in exePaths:
30  
-                self.remoteExePath = exePaths['default']
31  
-            else:
32  
-                self.remoteExePath = 'org.mozilla.fennec'
33  
-
  26
+        self.remoteProcessName = remoteProcessName
34 27
         self.remoteOptions = self.remoteExtras.get('options', [])
35 28
 
36 29
         self.branch = branch
@@ -48,7 +41,8 @@ def __init__(self, branch, branchName, executablePath,
48 41
                 branchName=branchName, executablePath=executablePath,
49 42
                 remoteTests=remoteTests, useSymbols=useSymbols,
50 43
                 extName=extName, addonTester=addonTester,
51  
-                remoteExtras=self.remoteExtras)
  44
+                remoteExtras=self.remoteExtras,
  45
+                remoteProcessName=remoteProcessName)
52 46
 
53 47
     def setBuild(self, build):
54 48
         self.super_class.setBuild(self, build)
@@ -64,7 +58,7 @@ def setBuild(self, build):
64 58
             self.addOptions += ['--symbolsPath', '../symbols']
65 59
 
66 60
         if self.remoteTests:
67  
-            exePath = self.remoteExePath
  61
+            exePath = self.remoteProcessName
68 62
             perfconfigurator = "remotePerfConfigurator.py"
69 63
             self.addOptions += ['--remoteDevice', WithProperties('%(sut_ip)s'), ]
70 64
             self.addOptions += self.remoteOptions

0 notes on commit 68a2f75

Please sign in to comment.
Something went wrong with that request. Please try again.