Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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
@armenzg armenzg authored
View
11 misc.py
@@ -205,6 +205,17 @@ def changeContainsProduct(change, productName):
return False
+def changeBaseTagContainsScriptRepoRevision(change, baseTag):
+ script_repo_revision = change.properties.getProperty("script_repo_revision")
+ baseTag = baseTag + "_"
+ if isinstance(script_repo_revision, basestring) and \
+ baseTag in script_repo_revision:
+ log.msg("baseTag '%s' IS in script_repo_revision '%s'" % (baseTag, script_repo_revision))
+ return True
+ log.msg("baseTag '%s' IS NOT in script_repo_revision '%s'" % (baseTag, script_repo_revision))
+ return False
+
+
def changeContainsProperties(change, props={}):
for prop, value in props.iteritems():
if change.properties.getProperty(prop) != value:
View
2  process/factory.py
@@ -1956,7 +1956,7 @@ def addSubmitBalrogUpdates(self):
cmd = [
self.env.get('PYTHON26', 'python'),
WithProperties(
- '%(toolsdir)s/scripts/updates/balrog-client.py'),
+ '%(toolsdir)s/scripts/updates/balrog-submitter.py'),
'--build-properties', 'buildprops_balrog.json',
'--api-root', self.balrog_api_root,
'--verbose',
View
6 process/release.py
@@ -27,7 +27,8 @@
from buildbotcustom.status.mail import ChangeNotifier
from buildbotcustom.misc import get_l10n_repositories, \
generateTestBuilderNames, generateTestBuilder, _nextFastSlave, \
- changeContainsProduct, nomergeBuilders, changeContainsProperties
+ changeContainsProduct, nomergeBuilders, changeContainsProperties, \
+ changeBaseTagContainsScriptRepoRevision
from buildbotcustom.common import normalizeName
from buildbotcustom.process.factory import StagingRepositorySetupFactory, \
ScriptFactory, SingleSourceFactory, ReleaseBuildFactory, \
@@ -1581,7 +1582,8 @@ def getMessageId():
builderNames=[builderPrefix(
'%s_reset_schedulers' % releaseConfig['productName'])],
fileIsImportant=lambda c: changeContainsProduct(c,
- releaseConfig['productName'])
+ releaseConfig['productName']) \
+ and changeBaseTagContainsScriptRepoRevision(c, releaseConfig['baseTag']),
)
schedulers.append(reset_schedulers_scheduler)
if releaseConfig.get('enable_repo_setup'):
View
6 steps/unittest.py
@@ -588,7 +588,11 @@ def __init__(self, suite, symbols_path=None, leakThreshold=None, **kwargs):
self.name = suite
- self.command = ['python', WithProperties("%(toolsdir)s/buildfarm/utils/run_jetpack.py"), '-p', WithProperties("%(platform)s")]
+ self.command = [
+ 'python', 'jetpack/bin/cfx',
+ WithProperties('--binary=%(exepath)s'),
+ '--parseable', 'testpkgs'
+ ]
# TODO: When jetpack can handle symbols path and leak testing, add those
# until then, we skip that.
Please sign in to comment.
Something went wrong with that request. Please try again.