Bug 1482395: [mozrelease] Fix product details links for beta and deveditions; r=sfraser
authorTom Prince <mozilla@hocat.ca>
Wed, 28 Nov 2018 09:54:40 +0000
changeset 507699 dd2f3ac3a0baa2993f64a7fdcde82592e09a375c
parent 507698 0354843436646c05cf3eac5059b65a4bb03e3a6a
child 507700 1af50e5a47da5a1c95c7bb915d23704c12846dfc
push id1905
push userffxbld-merge
push dateMon, 21 Jan 2019 12:33:13 +0000
treeherdermozilla-release@c2fca1944d8c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssfraser
bugs1482395
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1482395: [mozrelease] Fix product details links for beta and deveditions; r=sfraser Differential Revision: https://phabricator.services.mozilla.com/D13225
python/mozrelease/test/data/Firefox-62.0b11.update.json
python/mozrelease/test/data/Firefox-64.0b13.update.json
python/mozrelease/test/test_balrog.py
taskcluster/taskgraph/transforms/balrog_toplevel.py
rename from python/mozrelease/test/data/Firefox-62.0b11.update.json
rename to python/mozrelease/test/data/Firefox-64.0b13.update.json
--- a/python/mozrelease/test/data/Firefox-62.0b11.update.json
+++ b/python/mozrelease/test/data/Firefox-64.0b13.update.json
@@ -1,9 +1,9 @@
 [
     {
         "fields": {
-            "detailsURL": "https://www.mozilla.org/%LOCALE%/firefox/62.0b11/releasenotes/",
+            "detailsURL": "https://www.mozilla.org/%LOCALE%/firefox/64.0/releasenotes/",
             "type": "minor"
         },
         "for": {}
     }
 ]
--- a/python/mozrelease/test/test_balrog.py
+++ b/python/mozrelease/test/test_balrog.py
@@ -22,18 +22,18 @@ DATA_PATH = Path(__file__).parent.joinpa
     ({
         'release-type': 'release',
         'product': 'firefox',
         'version': GeckoVersion.parse('62.0.3'),
     }, 'whatsnew-62.0.3.yml', 'Firefox-62.0.3.update.json'),
     ({
         'release-type': 'beta',
         'product': 'firefox',
-        'version': GeckoVersion.parse('62.0b11'),
-    }, 'whatsnew-62.0.3.yml', 'Firefox-62.0b11.update.json'),
+        'version': GeckoVersion.parse('64.0'),
+    }, 'whatsnew-62.0.3.yml', 'Firefox-64.0b13.update.json'),
 ])
 def test_update_properties(context, config_file, output_file):
     with DATA_PATH.joinpath(config_file).open('r', encoding='utf-8') as f:
         config = yaml_load(f)
 
     update_line = generate_update_properties(context, config)
 
     assert update_line == json.load(DATA_PATH.joinpath(output_file).open('r', encoding='utf-8'))
--- a/taskcluster/taskgraph/transforms/balrog_toplevel.py
+++ b/taskcluster/taskgraph/transforms/balrog_toplevel.py
@@ -24,20 +24,23 @@ transforms = TransformSequence()
 def generate_update_line(config, jobs):
     """Resolve fields that can be keyed by platform, etc."""
     release_config = get_release_config(config)
     for job in jobs:
         config_file = job.pop('whats-new-config')
         with open(config_file, "rb") as f:
             update_config = yaml.safe_load(f)
 
+        product = job['shipping-product']
+        if product == 'devedition':
+            product = 'firefox'
         job['worker']['update-line'] = {}
         for blob_type, suffix in [('wnp', ''), ('no-wnp', '-No-WNP')]:
             context = {
                 'release-type': config.params['release_type'],
-                'product': job['shipping-product'],
-                'version': GeckoVersion.parse(release_config['version']),
+                'product': product,
+                'version': GeckoVersion.parse(release_config['appVersion']),
                 'blob-type': blob_type,
             }
             job['worker']['update-line'][suffix] = generate_update_properties(
                 context, update_config)
 
         yield job