bug 1393639 - adjust relpro beetmover for linux repackage. r=nthomas draft
authorAki Sasaki <asasaki@mozilla.com>
Thu, 24 Aug 2017 17:58:52 -0700
changeset 652610 4e8cb36462587264ff902501311329ea2873ce4f
parent 652609 d51bedb9d492abba795601298b90a7670b19e228
child 728124 62291d52bf25ce3ec68ccf210666e20a2b3b6056
push id76095
push userasasaki@mozilla.com
push dateFri, 25 Aug 2017 00:59:13 +0000
reviewersnthomas
bugs1393639
milestone56.0
bug 1393639 - adjust relpro beetmover for linux repackage. r=nthomas MozReview-Commit-ID: KshF2eUR1z1
testing/mozharness/configs/beetmover/en_us_repackage_signing.yml.tmpl
testing/mozharness/configs/beetmover/en_us_signing.yml.tmpl
--- a/testing/mozharness/configs/beetmover/en_us_repackage_signing.yml.tmpl
+++ b/testing/mozharness/configs/beetmover/en_us_repackage_signing.yml.tmpl
@@ -14,27 +14,22 @@ mapping:
     full_installer:
       artifact: {{ artifact_base_url }}/target.installer.exe
       s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/Firefox Setup {{ version }}.exe
     {% if "esr" not in version %}
     stub_installer:
       artifact: {{ artifact_base_url }}/target.stub-installer.exe
       s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/Firefox Installer.exe
     {% endif %}
-  {% endif %}
-
-  {% if platform == "win64" %}
+  {% elif platform == "win64" %}
     complete_mar:
       artifact: {{ artifact_base_url }}/target.complete.mar
       s3_key: {{ s3_prefix }}update/{{ platform }}/{{ locale }}/firefox-{{ version }}.complete.mar
     full_installer:
       artifact: {{ artifact_base_url }}/target.installer.exe
       s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/Firefox Setup {{ version }}.exe
-  {% endif %}
-
-
-  {% if platform == "mac" %}
+  {% else %}
     complete_mar:
       artifact: {{ artifact_base_url }}/target.complete.mar
       s3_key: {{ s3_prefix }}update/{{ platform }}/{{ locale }}/firefox-{{ version }}.complete.mar
   {% endif %}
 
 {% endfor %}
--- a/testing/mozharness/configs/beetmover/en_us_signing.yml.tmpl
+++ b/testing/mozharness/configs/beetmover/en_us_signing.yml.tmpl
@@ -18,27 +18,21 @@ mapping:
       artifact: {{ artifact_base_url }}/target.zip
       s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/firefox-{{ version }}.zip
   {% endif %}
 
   {% if platform == "linux-i686" %}
     package:
       artifact: {{ artifact_base_url }}/target.tar.bz2
       s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/firefox-{{ version }}.tar.bz2
-    complete_mar:
-      artifact: {{ artifact_base_url }}/update/target.complete.mar
-      s3_key: {{ s3_prefix }}update/{{ platform }}/{{ locale }}/firefox-{{ version }}.complete.mar
   {% endif %}
 
   {% if platform == "linux-x86_64" %}
     package:
       artifact: {{ artifact_base_url }}/target.tar.bz2
       s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/firefox-{{ version }}.tar.bz2
-    complete_mar:
-      artifact: {{ artifact_base_url }}/update/target.complete.mar
-      s3_key: {{ s3_prefix }}update/{{ platform }}/{{ locale }}/firefox-{{ version }}.complete.mar
   {% endif %}
 
   {% if platform == "mac" %}
   # nothing to see here
   {% endif %}
 
 {% endfor %}