Backout bad release config bumps.
authorBen Hearsum <bhearsum@mozilla.com>
Fri, 24 Apr 2015 09:00:21 -0400 (2015-04-24)
changeset 12232 cea8d17dbaff92a21dc8da0e48f573c4836b847d
parent 12231 87e01a004f2083e58fa1542408f14c7ad62ac21c
child 12236 d3beb963babb80c8d37533c7780d26c63e6115c3
push id8844
push userbhearsum@mozilla.com
push dateFri, 24 Apr 2015 13:00:58 +0000 (2015-04-24)
Backout bad release config bumps.
mozilla/l10n-changesets_mozilla-release
mozilla/release-firefox-mozilla-release.py
--- a/mozilla/l10n-changesets_mozilla-release
+++ b/mozilla/l10n-changesets_mozilla-release
@@ -1,89 +1,89 @@
-ach 	eb14f43e5f05
-af 	0a4de99b5beb
-an 	cb58bb3e9648
-ar 	f2273f905147
-as 	8313f975ae77
-ast 	0c54c4102de4
-az 	3ec33d7e53ad
-be 	b72077740aac
-bg 	7ef2fcfd7e93
-bn-BD 	ab9122b22e7b
-bn-IN 	e4dd4d7f827a
-br 	bcf57cc518e0
-bs 	8fc6fcbbced3
-ca 	c2545bf16445
-cs 	b18a452bd422
-cy 	3682f66168f1
-da 	322bf0c0f168
-de 	874394ae620d
-dsb 	11e4cd26eff8
-el 	22b959c9a739
-en-GB 	7757a36df513
-en-ZA 	720d9153b07b
-eo 	d417b4408750
-es-AR 	8674d98b9622
-es-CL 	cad9a43b71b1
-es-ES 	bf6c1d90416f
-es-MX 	189c22cc262e
-et 	4db328a2baca
-eu 	39fdd7acd3d7
-fa 	2b301cf923d6
-ff 	8373353b43c4
-fi 	b788e25780aa
-fr 	f36e1b1a6a73
-fy-NL 	60bd7ed0023e
-ga-IE 	e3e13dbcfdb2
-gd 	429c41e2fd04
-gl 	020633ffb068
-gu-IN 	6245b4309461
-he 	5f6b95c1a280
-hi-IN 	c9852428b37c
-hr 	7eea72a9979b
-hsb 	1a914026dd3d
-hu 	1e5efccedf51
-hy-AM 	6ba5861d610c
-id 	6615fd2b3902
-is 	b31b8bb144eb
-it 	64755a9f715d
-ja 	83277581e2c2
-ja-JP-mac 	969cfe80d151
-kk 	16da9c4b7cb2
-km 	7068671cb929
-kn 	de74fa4335f4
-ko 	b2b4b048b5c2
-lij 	d6d009b4b3e3
-lt 	248fa3e2df31
-lv 	a43c7e178b45
-mai 	2238b9975f69
-mk 	ffdf2a789185
-ml 	7beaa1b99a70
-mr 	cf332e28ce07
-ms 	21758a6d677d
-nb-NO 	994001c1df56
-nl 	f4cb4aca6ad5
-nn-NO 	0b57b869d1a8
-or 	febd1b04dbfc
-pa-IN 	c23345c23e09
-pl 	354aaeca4d02
-pt-BR 	c304298e3b54
-pt-PT 	3a6ea78538d4
-rm 	9c75355c77cc
-ro 	8e352ff9ef16
-ru 	ed56aec3908d
-si 	d372f7911621
-sk 	a4cd93ea081a
-sl 	31a0ddc0b866
-son 	8ed54a34d981
-sq 	b37e7868a7a3
-sr 	e50bdb176434
-sv-SE 	fd25ba166802
-ta 	f19574559deb
-te 	d21d9987b695
-th 	38b51ad9beba
-tr 	ee1a0c5250f9
-uk 	2f3dec2ca792
-uz 	9e4c614d46b0
-vi 	b0da05539c22
-xh 	188db6e5e36d
-zh-CN 	b67602d9ea30
-zh-TW 	f42c68dd7580
\ No newline at end of file
+ach	2769a8091625
+af	13009535ceb5
+an	54d54ad7f055
+ar	f5f076482bbe
+as	8313f975ae77
+ast	f1f766b43428
+az	ca2ebce76995
+be	b72077740aac
+bg	8ccd79c7bb10
+bn-BD	ab9122b22e7b
+bn-IN	7a0fdcb2138e
+br	fe85fa232af8
+bs	8fc6fcbbced3
+ca	a82c599fc47e
+cs	8ec5c9bec1ec
+cy	0b331474ad75
+da	70e31e0365e7
+de	489d34892f39
+dsb	e0afc005de1a
+el	22b959c9a739
+en-GB	c58bc9c04e08
+en-ZA	720d9153b07b
+eo	d417b4408750
+es-AR	0a3ec2750ed2
+es-CL	777e3ec595fc
+es-ES	ffbb482cf6d4
+es-MX	578be77fcbfb
+et	c2333cdebabd
+eu	fb37621ebf55
+fa	189c4346605f
+ff	136f012da97b
+fi	d783dd22dcd7
+fr	0ab43256568d
+fy-NL	03fc810b4fef
+ga-IE	37f950d5bfe5
+gd	d63927c796f6
+gl	020633ffb068
+gu-IN	6245b4309461
+he	5f6b95c1a280
+hi-IN	a86619e8cb23
+hr	12f40dc30839
+hsb	18a91b0308bb
+hu	776877175020
+hy-AM	2697ef294607
+id	eb0632575a5d
+is	0a4840edc8ab
+it	a4ca332e0c44
+ja	4401bcf30b89
+ja-JP-mac	c6197d65aea0
+kk	186850e2efc6
+km	0fb30b2e61a5
+kn	8057a3f3eb07
+ko	a78293b3d20b
+lij	d6d009b4b3e3
+lt	d354c734bf60
+lv	eb202e27be2d
+mai	2238b9975f69
+mk	ffdf2a789185
+ml	7beaa1b99a70
+mr	f35eb59da5c1
+ms	17c25034aaf5
+nb-NO	e7d6ce466971
+nl	271bd8bff1b4
+nn-NO	38775fe1e15f
+or	febd1b04dbfc
+pa-IN	efd291dbad63
+pl	486a1ea0bfa6
+pt-BR	c304298e3b54
+pt-PT	bd0d58a7dfaf
+rm	97185af86535
+ro	106f42a68e8f
+ru	930d0b1f0bd9
+si	48276a49b52b
+sk	1eedc78c53e1
+sl	00608c254cb2
+son	2a26af5679df
+sq	4389a375149c
+sr	c4e0ff47b37f
+sv-SE	be229b521967
+ta	f43e6d1a4fce
+te	8861d007060a
+th	9db57df68980
+tr	b1c55920d4f4
+uk	c49dbf3de1de
+uz	2cb9e5cdcbb4
+vi	b0da05539c22
+xh	188db6e5e36d
+zh-CN	910d93e923f1
+zh-TW	e3fb41abf001
\ No newline at end of file
--- a/mozilla/release-firefox-mozilla-release.py
+++ b/mozilla/release-firefox-mozilla-release.py
@@ -16,52 +16,70 @@ releaseConfig['releaseTemplates']    = '
 releaseConfig['messagePrefix']       = '[release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'firefox'
 releaseConfig['stage_product']       = 'firefox'
 releaseConfig['appName']             = 'browser'
 #  Current version info
-releaseConfig['version']             = '38.0b7'
-releaseConfig['appVersion']          = '38.0'
+releaseConfig['version']             = '37.0.2'
+releaseConfig['appVersion']          = '37.0.2'
 releaseConfig['milestone']           = releaseConfig['appVersion']
-releaseConfig['buildNumber']         = 2
-releaseConfig['baseTag']             = 'FIREFOX_38_0b7'
+releaseConfig['buildNumber']         = 1
+releaseConfig['baseTag']             = 'FIREFOX_37_0_2'
 releaseConfig['partialUpdates']      = {
 
-    '38.0b6': {
-        'appVersion': '38.0',
+    '37.0b1': {
+        'appVersion': '37.0',
+        'buildNumber': 2,
+        'baseTag': 'FIREFOX_37_0',
+    },
+
+    '37.0.1': {
+        'appVersion': '37.0.1',
         'buildNumber': 1,
-        'baseTag': 'FIREFOX_38_0b6',
+        'baseTag': 'FIREFOX_37_0_1',
     },
 
-    '38.0b5': {
-        'appVersion': '38.0',
+    '36.0.1': {
+        'appVersion': '36.0.1',
+        'buildNumber': 2,
+        'baseTag': 'FIREFOX_36_0_1',
+    },
+
+    '35.0.1': {
+        'appVersion': '35.0.1',
         'buildNumber': 1,
-        'baseTag': 'FIREFOX_38_0b5',
+        'baseTag': 'FIREFOX_35_0_1',
+    },
+
+    '36.0.4': {
+        'appVersion': '36.0.4',
+        'buildNumber': 1,
+        'baseTag': 'FIREFOX_36_0_4',
     },
 
 }
 # What's New Page for https://bugzilla.mozilla.org/show_bug.cgi?id=1133579.
 # TODO: Remove upon request. Should be revisited with each release.
-releaseConfig['openURL'] = 'https://www.mozilla.org/%LOCALE%/firefox/38.0/whatsnew/?oldversion=%OLD_VERSION%'
+releaseConfig['openURL'] = 'https://www.mozilla.org/%LOCALE%/firefox/37.0.2/whatsnew/?oldversion=%OLD_VERSION%'
 
 # TODO: set this properly when we start shipping win64 on release
 #releaseConfig['HACK_first_released_version'] = {'win64': TBD}
 
 #  Next (nightly) version info
 releaseConfig['nextAppVersion']      = releaseConfig['appVersion']
 releaseConfig['nextMilestone']       = releaseConfig['milestone']
 #  Repository configuration, for tagging
 releaseConfig['sourceRepositories']  = {
     'mozilla': {
         'name': 'mozilla-release',
         'path': 'releases/mozilla-release',
-        'revision': '8a2c933394da',
+        'revision': '5aa012e8ba58',
         'relbranch': None,
         'bumpFiles': {
             'browser/config/version.txt': {
                 'version': releaseConfig['appVersion'],
                 'nextVersion': releaseConfig['nextAppVersion']
             },
             'config/milestone.txt': {
                 'version': releaseConfig['milestone'],
@@ -149,36 +167,32 @@ releaseConfig['updateChannels'] = {
                 "ruleId": 56,
             },
             "release-cdntest": {
                 "ruleId": 57,
             },
         },
     },
     "beta": {
-        "enabled": False,
+        "enabled": True,
         # For the beta channel, we want to able to provide updates to this
         # from prior betas or prior RCs that were shipped to the beta channel,
         # so this regex matches either.
         "versionRegex": r"^(\d+\.\d+b\d+|%s)$" % releaseConfig["version"].replace(".", "\\."),
         "ruleId": 32,
         "requiresMirrors": False,
         "patcherConfig": "mozBeta-branch-patcher2.cfg",
         "localTestChannel": "beta-localtest",
         "cdnTestChannel": "beta-cdntest",
         "verifyConfigs": {
             "linux":  "mozBeta-firefox-linux.cfg",
             "linux64":  "mozBeta-firefox-linux64.cfg",
             "macosx64": "mozBeta-firefox-mac64.cfg",
             "win32":  "mozBeta-firefox-win32.cfg"
         },
-        "marChannelIds": [
-            "firefox-mozilla-beta",
-            "firefox-mozilla-release",
-        ],
         "testChannels": {
             "beta-cdntest": {
                 "ruleId": 45,
             },
             "beta-localtest": {
                 "ruleId": 25,
             },
         }
@@ -204,9 +218,9 @@ releaseConfig['makeIndexFiles'] = True
 releaseConfig['enable_repo_setup'] = False
 releaseConfig['use_mock'] = True
 releaseConfig['mock_platforms'] = ('linux','linux64')
 releaseConfig['ftpSymlinkName'] = 'latest'
 
 releaseConfig['bouncer_aliases'] = {
     'Firefox-%(version)s': 'firefox-latest',
     'Firefox-%(version)s-stub': 'firefox-stub',
-}
\ No newline at end of file
+}