Bug 1246074 - add partials template config for mozharness beetmover, DONTBUILD r=rail
authorJordan Lund <jlund@mozilla.com>
Sat, 06 Feb 2016 13:46:13 -0800
changeset 304331 eac483b947382d34ce5ce1b7659b13a700b9e9d9
parent 304330 962424f7af9e7bf2ce9525a0d7121d67e019f7c7
child 304332 04db0fd4362f4ca2e9c1d51700fbc93df04a3c6a
push id9175
push userraliiev@mozilla.com
push dateThu, 03 Mar 2016 03:39:52 +0000
treeherdermozilla-aurora@0bee186afe5a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrail
bugs1246074
milestone46.0a2
Bug 1246074 - add partials template config for mozharness beetmover, DONTBUILD r=rail MozReview-Commit-ID: IFPXCHnZSoj
testing/mozharness/configs/beetmover/partials.yml.tmpl
testing/mozharness/scripts/release/beet_mover.py
copy from testing/mozharness/configs/beetmover/repacks.yml.tmpl
copy to testing/mozharness/configs/beetmover/partials.yml.tmpl
--- a/testing/mozharness/configs/beetmover/repacks.yml.tmpl
+++ b/testing/mozharness/configs/beetmover/partials.yml.tmpl
@@ -1,61 +1,16 @@
 ---
 metadata:
     name: "Beet Mover Manifest"
-    description: "Maps artifact locations to s3 key names for the non en-US locales"
+    description: "Maps artifact locations to s3 key names for partials"
     owner: "release@mozilla.com"
 
 mapping:
 {% for locale in locales %}
-  # common deliverables
   {{ locale }}:
-    complete_mar:
-      artifact: {{ artifact_base_url }}/firefox-{{ app_version }}.{{ locale }}.{{ platform }}.complete.mar
-      s3_key: {{ s3_prefix }}/{{ version }}-candidates/{{ build_num }}/update/{{ platform }}/{{ locale }}/firefox-{{ version }}.complete.mar
-# Bug 1242782 - release promotion mozharness l10n tasks should upload checksum and sigs
-#    checksum:
-#      artifact: {{ artifact_base_url }}/firefox-{{ app_version }}.{{ locale }}.{{ platform }}.checksums
-#      s3_key: {{ s3_prefix }}/{{ version }}-candidates/{{ build_num }}/{{ platform }}/{{ locale }}/firefox-{{ version }}.checksums
-#    checksum_sig:
-#      artifact: {{ artifact_base_url }}/firefox-{{ app_version }}.{{ locale }}.{{ platform }}.checksums.asc
-#      s3_key: {{ s3_prefix }}/{{ version }}-candidates/{{ build_num }}/{{ platform }}/{{ locale }}/firefox-{{ version }}.checksums.asc
-
-  {% if platform == "win32" %}
-    full_installer:
-      artifact: {{ artifact_base_url }}/firefox-{{ app_version }}.{{ locale }}.{{ platform }}.installer.exe
-      s3_key: {{ s3_prefix }}/{{ version }}-candidates/{{ build_num }}/{{ platform }}/{{ locale }}/Firefox Setup {{ version }}.exe
-    stub_installer:
-      artifact: {{ artifact_base_url }}/firefox-{{ app_version }}.{{ locale }}.{{ platform }}.installer-stub.exe
-      s3_key: {{ s3_prefix }}/{{ version }}-candidates/{{ build_num }}/{{ platform }}/{{ locale }}/Firefox Setup Stub {{ version }}.exe
-    package:
-      artifact: {{ artifact_base_url }}/firefox-{{ app_version }}.{{ locale }}.{{ platform }}.zip
-      s3_key: {{ s3_prefix }}/{{ version }}-candidates/{{ build_num }}/{{ platform }}/{{ locale }}/firefox-{{ version }}.zip
-  {% endif %}
-
-  {% if platform == "win64" %}
-    full_installer:
-      artifact: {{ artifact_base_url }}/firefox-{{ app_version }}.{{ locale }}.{{ platform }}.installer.exe
-      s3_key: {{ s3_prefix }}/{{ version }}-candidates/{{ build_num }}/{{ platform }}/{{ locale }}/Firefox Setup {{ version }}.exe
-    package:
-      artifact: {{ artifact_base_url }}/firefox-{{ app_version }}.{{ locale }}.{{ platform }}.zip
-      s3_key: {{ s3_prefix }}/{{ version }}-candidates/{{ build_num }}/{{ platform }}/{{ locale }}/firefox-{{ version }}.zip
-  {% endif %}
-
-  {% if platform == "linux-i686" %}
-    package:
-      artifact: {{ artifact_base_url }}/firefox-{{ app_version }}.{{ locale }}.{{ platform }}.tar.bz2
-      s3_key: {{ s3_prefix }}/{{ version }}-candidates/{{ build_num }}/{{ platform }}/{{ locale }}/firefox-{{ version }}.tar.bz2
-  {% endif %}
-
-  {% if platform == "linux-x86_64" %}
-    package:
-      artifact: {{ artifact_base_url }}/firefox-{{ app_version }}.{{ locale }}.{{ platform }}.tar.bz2
-      s3_key: {{ s3_prefix }}/{{ version }}-candidates/{{ build_num }}/{{ platform }}/{{ locale }}/firefox-{{ version }}.tar.bz2
-  {% endif %}
-
-  {% if platform == "mac" %}
-    package:
-      artifact: {{ artifact_base_url }}/firefox-{{ app_version }}.{{ locale }}.{{ platform }}.dmg
-      s3_key: {{ s3_prefix }}/{{ version }}-candidates/{{ build_num }}/{{ platform }}/{{ locale }}/Firefox {{ version }}.dmg
-  {% endif %}
-
+    partial_mar:
+      artifact: {{ artifact_base_url }}/firefox-{{ partial_version }}-{{ version }}.{{ locale }}.{{ platform }}.partial.mar
+      s3_key: {{ s3_prefix }}/{{ version }}-candidates/{{ build_num }}/update/{{ platform }}/{{ locale }}/firefox-{{ partial_version }}-{{ version }}.partial.mar
+    partial_mar_sig:
+      artifact: {{ artifact_base_url }}/firefox-{{ partial_version }}-{{ version }}.{{ locale }}.{{ platform }}.partial.mar.asc
+      s3_key: {{ s3_prefix }}/{{ version }}-candidates/{{ build_num }}/update/{{ platform }}/{{ locale }}/firefox-{{ partial_version }}-{{ version }}.partial.mar.asc
 {% endfor %}
--- a/testing/mozharness/scripts/release/beet_mover.py
+++ b/testing/mozharness/scripts/release/beet_mover.py
@@ -58,16 +58,20 @@ CONFIG_OPTIONS = [
     [["--version"], {
         "dest": "version",
         "help": "full release version based on gecko and tag/stage identifier. e.g. '44.0b1'"
     }],
     [["--app-version"], {
         "dest": "app_version",
         "help": "numbered version based on gecko. e.g. '44.0'"
     }],
+    [["--partial-version"], {
+        "dest": "partial_version",
+        "help": "the partial version the mar is based off of"
+    }],
     [["--build-num"], {
         "dest": "build_num",
         "help": "the release build identifier"
     }],
     [["--taskid"], {
         "dest": "taskid",
         "help": "taskcluster task id to download artifacts from",
     }],
@@ -152,17 +156,18 @@ class BeetMover(BaseScript, VirtualenvMi
 
         jinja_env = jinja2.Environment(loader=jinja2.FileSystemLoader(template_dir),
                                        undefined=jinja2.StrictUndefined)
         template = jinja_env.get_template(template_file)
         template_vars = {
             "platform": self.config['platform'],
             "locales": self.config['locales'],
             "version": self.config['version'],
-            "app_version": self.config['app_version'],
+            "app_version": self.config.get('app_version', ''),
+            "partial_version": self.config.get('partial_version', ''),
             "build_num": self.config['build_num'],
             # mirror current release folder structure
             "s3_prefix": 'pub/{}/candidates'.format(self.config['product']),
             "artifact_base_url": self.config['artifact_base_url'].format(
                     taskid=self.config['taskid']
             )
         }
         self.manifest = yaml.safe_load(template.render(**template_vars))