bug 1393639 - adjust relpro beetmover for linux repackage. r=nthomas a=release DONTBUILD
authorAki Sasaki <asasaki@mozilla.com>
Fri, 25 Aug 2017 17:41:50 -0700
changeset 423803 9097842054e4c849051307993001d78d8e443d3f
parent 423802 a933f4ce887f3d1c27dd836ea4e92c157eb33259
child 423804 b6ef38d032294bd3584578640ebe81ddb1bcd1da
push id1517
push userjlorenzo@mozilla.com
push dateThu, 14 Sep 2017 16:50:54 +0000
treeherdermozilla-release@3b41fd564418 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnthomas, release
bugs1393639
milestone56.0
bug 1393639 - adjust relpro beetmover for linux repackage. r=nthomas a=release DONTBUILD
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 %}