Skip to content
Browse files

bug 842741: wrong release config bumped during Thunderbird 17.0.3. r=…

…rail
  • Loading branch information...
1 parent c4a3bf4 commit c991947e85cbb4d78bc6232245bddd969b4e46ee @bhearsum bhearsum committed
View
2 buildfarm/release/release-runner.py
@@ -320,7 +320,7 @@ def process_configs(repo, attempt):
update(configs_workdir, revision='default')
cfgFile = getReleaseConfigName(
release['product'], path.basename(release['branch']),
- staging)
+ release['version'], staging)
bump_configs(release=release, cfgFile=cfgFile,
l10nContents=l10nContents, workdir=configs_workdir,
hg_username=hg_username,
View
6 lib/python/mozilla_buildtools/test/test_release_info.py
@@ -36,5 +36,9 @@ def testThunderbird(self):
self.assertEquals('release-thunderbird-comm-esr17.py', got)
def testStaging(self):
- got = getReleaseConfigName('fennec', 'mozilla-release', True)
+ got = getReleaseConfigName('fennec', 'mozilla-release', staging=True)
self.assertEquals('staging_release-fennec-mozilla-release.py', got)
+
+ def testThunderbirdCommReleaseSpecialCase(self):
+ got = getReleaseConfigName('thunderbird', 'comm-esr17', version='17.0.3')
+ self.assertEquals('release-thunderbird-comm-release.py', got)
View
10 lib/python/release/info.py
@@ -55,8 +55,14 @@ def findOldBuildIDs(product, version, buildNumber, platforms,
return ids
-def getReleaseConfigName(product, branch, staging=False):
- cfg = 'release-%s-%s.py' % (product, branch)
+def getReleaseConfigName(product, branch, version=None, staging=False):
+ # XXX: Horrible hack for bug 842741. Because Thunderbird release
+ # and esr both build out of esr17 repositories we'll bump the wrong
+ # config for release without this.
+ if product == 'thunderbird' and 'esr17' in branch and version and 'esr' not in version:
+ cfg = 'release-thunderbird-comm-release.py'
+ else:
+ cfg = 'release-%s-%s.py' % (product, branch)
if staging:
cfg = 'staging_%s' % cfg
return cfg

0 comments on commit c991947

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