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

changeset:   3002:8958772bbb94
parent:      2999:8fef6e2c7e5a
parent:      3001:0dc51680c591
user:        Ben Hearsum <bhearsum@mozilla.com>
date:        Thu Feb 14 09:44:21 2013 -0500
summary:     Merge back to default

changeset:   3003:888e0704372f
user:        Ben Hearsum <bhearsum@mozilla.com>
date:        Thu Feb 14 16:48:28 2013 -0500
summary:     bug 832463: rename balrog-client.py (and associated bits) to balrog-submitter.py. r=rail

changeset:   3004:dba06991d84b
user:        John Hopkins <jhopkins@mozilla.com>
date:        Fri Feb 15 08:19:03 2013 -0500
summary:     Bug 841550 - Thunderbird mainline and ESR builds started from same sendchange. r=aki

changeset:   3005:422bff524fde
tag:         tip
user:        Armen Zambrano Gasparnian <armenzg@mozilla.com>
date:        Fri Feb 15 09:28:37 2013 -0500
summary:     Bug 826933 - Update jetpack test suite to run in-tree version. r=aki

--HG--
branch : production-0.8
  • Loading branch information...
commit 91e0db16b3e55a4c8988e9cce2b34884ba69950a 2 parents 935a654 + ad34a62
authored February 15, 2013
11  misc.py
@@ -205,6 +205,17 @@ def changeContainsProduct(change, productName):
205 205
     return False
206 206
 
207 207
 
  208
+def changeBaseTagContainsScriptRepoRevision(change, baseTag):
  209
+    script_repo_revision = change.properties.getProperty("script_repo_revision")
  210
+    baseTag = baseTag + "_"
  211
+    if isinstance(script_repo_revision, basestring) and \
  212
+            baseTag in script_repo_revision:
  213
+            log.msg("baseTag '%s' IS in script_repo_revision '%s'" % (baseTag, script_repo_revision))
  214
+            return True
  215
+    log.msg("baseTag '%s' IS NOT in script_repo_revision '%s'" % (baseTag, script_repo_revision))
  216
+    return False
  217
+
  218
+
208 219
 def changeContainsProperties(change, props={}):
209 220
     for prop, value in props.iteritems():
210 221
         if change.properties.getProperty(prop) != value:
2  process/factory.py
@@ -1956,7 +1956,7 @@ def addSubmitBalrogUpdates(self):
1956 1956
             cmd = [
1957 1957
                 self.env.get('PYTHON26', 'python'),
1958 1958
                 WithProperties(
1959  
-                    '%(toolsdir)s/scripts/updates/balrog-client.py'),
  1959
+                    '%(toolsdir)s/scripts/updates/balrog-submitter.py'),
1960 1960
                 '--build-properties', 'buildprops_balrog.json',
1961 1961
                 '--api-root', self.balrog_api_root,
1962 1962
                 '--verbose',
6  process/release.py
@@ -27,7 +27,8 @@
27 27
 from buildbotcustom.status.mail import ChangeNotifier
28 28
 from buildbotcustom.misc import get_l10n_repositories, \
29 29
     generateTestBuilderNames, generateTestBuilder, _nextFastSlave, \
30  
-    changeContainsProduct, nomergeBuilders, changeContainsProperties
  30
+    changeContainsProduct, nomergeBuilders, changeContainsProperties, \
  31
+    changeBaseTagContainsScriptRepoRevision
31 32
 from buildbotcustom.common import normalizeName
32 33
 from buildbotcustom.process.factory import StagingRepositorySetupFactory, \
33 34
     ScriptFactory, SingleSourceFactory, ReleaseBuildFactory, \
@@ -1581,7 +1582,8 @@ def getMessageId():
1581 1582
         builderNames=[builderPrefix(
1582 1583
             '%s_reset_schedulers' % releaseConfig['productName'])],
1583 1584
         fileIsImportant=lambda c: changeContainsProduct(c,
1584  
-                                                        releaseConfig['productName'])
  1585
+                                                        releaseConfig['productName']) \
  1586
+            and changeBaseTagContainsScriptRepoRevision(c, releaseConfig['baseTag']),
1585 1587
     )
1586 1588
     schedulers.append(reset_schedulers_scheduler)
1587 1589
     if releaseConfig.get('enable_repo_setup'):
6  steps/unittest.py
@@ -588,7 +588,11 @@ def __init__(self, suite, symbols_path=None, leakThreshold=None, **kwargs):
588 588
 
589 589
         self.name = suite
590 590
 
591  
-        self.command = ['python', WithProperties("%(toolsdir)s/buildfarm/utils/run_jetpack.py"), '-p', WithProperties("%(platform)s")]
  591
+        self.command = [
  592
+            'python', 'jetpack/bin/cfx',
  593
+            WithProperties('--binary=%(exepath)s'),
  594
+            '--parseable', 'testpkgs'
  595
+        ]
592 596
 
593 597
         # TODO: When jetpack can handle symbols path and leak testing, add those
594 598
         # until then, we skip that.

0 notes on commit 91e0db1

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