Bug 1381577 - Prepare release beetmover stuff (no reviewer pending rail's tests)
Land date changes to support windows nightlies onto central
MozReview-Commit-ID: EdVyxR7L8gI
--- a/testing/mozharness/configs/beetmover/en_us_build.yml.tmpl
+++ b/testing/mozharness/configs/beetmover/en_us_build.yml.tmpl
@@ -3,83 +3,16 @@ metadata:
name: "Beet Mover Manifest"
description: "Maps artifact locations to s3 key names for the en-US locale"
owner: "release@mozilla.com"
mapping:
{% for locale in locales %}
{{ locale }}:
- {% if platform == "win32" %}
- buildinfo:
- artifact: {{ artifact_base_url }}/firefox-{{ app_version }}.{{ locale }}.{{ platform }}.json
- s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/firefox-{{ version }}.json
- mozinfo:
- artifact: {{ artifact_base_url }}/firefox-{{ app_version }}.{{ locale }}.{{ platform }}.mozinfo.json
- s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/firefox-{{ version }}.mozinfo.json
- socorroinfo:
- artifact: {{ artifact_base_url }}/firefox-{{ app_version }}.{{ locale }}.{{ platform }}.txt
- s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/firefox-{{ version }}.txt
- jsshell:
- artifact: {{ artifact_base_url }}/jsshell-{{ platform }}.zip
- s3_key: {{ s3_prefix }}jsshell-{{ platform }}.zip
- mozharness_package:
- artifact: {{ artifact_base_url }}/mozharness.zip
- s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/mozharness.zip
- xpi:
- artifact: {{ artifact_base_url }}/firefox-{{ app_version }}.{{ locale }}.langpack.xpi
- s3_key: {{ s3_prefix }}{{ platform }}/xpi/{{ locale }}.xpi
- symbols:
- artifact: {{ artifact_base_url }}/firefox-{{ app_version }}.{{ locale }}.{{ platform }}.crashreporter-symbols.zip
- s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/firefox-{{ version }}.crashreporter-symbols.zip
- buildid_info:
- artifact: {{ artifact_base_url }}/firefox-{{ app_version }}.{{ locale }}.{{ platform }}_info.txt
- s3_key: {{ s3_prefix }}win32_info.txt
- mar_tools_mar:
- artifact: {{ artifact_base_url }}/mar.exe
- s3_key: {{ s3_prefix }}mar-tools/win32/mar.exe
- mar_tools_mbdiff:
- artifact: {{ artifact_base_url }}/mbsdiff.exe
- s3_key: {{ s3_prefix }}mar-tools/win32/mbsdiff.exe
- {% endif %}
-
- {% if platform == "win64" %}
- buildinfo:
- artifact: {{ artifact_base_url }}/firefox-{{ app_version }}.{{ locale }}.{{ platform }}.json
- s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/firefox-{{ version }}.json
- mozinfo:
- artifact: {{ artifact_base_url }}/firefox-{{ app_version }}.{{ locale }}.{{ platform }}.mozinfo.json
- s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/firefox-{{ version }}.mozinfo.json
- socorroinfo:
- artifact: {{ artifact_base_url }}/firefox-{{ app_version }}.{{ locale }}.{{ platform }}.txt
- s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/firefox-{{ version }}.txt
- jsshell:
- artifact: {{ artifact_base_url }}/jsshell-{{ platform }}.zip
- s3_key: {{ s3_prefix }}jsshell-{{ platform }}.zip
- mozharness_package:
- artifact: {{ artifact_base_url }}/mozharness.zip
- s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/mozharness.zip
- xpi:
- artifact: {{ artifact_base_url }}/firefox-{{ app_version }}.{{ locale }}.langpack.xpi
- s3_key: {{ s3_prefix }}{{ platform }}/xpi/{{ locale }}.xpi
- symbols:
- artifact: {{ artifact_base_url }}/firefox-{{ app_version }}.{{ locale }}.{{ platform }}.crashreporter-symbols.zip
- s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/firefox-{{ version }}.crashreporter-symbols.zip
- buildid_info:
- artifact: {{ artifact_base_url }}/firefox-{{ app_version }}.{{ locale }}.{{ platform }}_info.txt
- s3_key: {{ s3_prefix }}win64_info.txt
- mar_tools_mar:
- artifact: {{ artifact_base_url }}/mar.exe
- s3_key: {{ s3_prefix }}mar-tools/win64/mar.exe
- mar_tools_mbdiff:
- artifact: {{ artifact_base_url }}/mbsdiff.exe
- s3_key: {{ s3_prefix }}mar-tools/win64/mbsdiff.exe
- {% endif %}
-
- {% if platform == "linux-i686" %}
buildinfo:
artifact: {{ artifact_base_url }}/target.json
s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/firefox-{{ version }}.json
mozinfo:
artifact: {{ artifact_base_url }}/target.mozinfo.json
s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/firefox-{{ version }}.mozinfo.json
socorroinfo:
artifact: {{ artifact_base_url }}/target.txt
@@ -91,84 +24,68 @@ mapping:
artifact: {{ artifact_base_url }}/mozharness.zip
s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/mozharness.zip
xpi:
artifact: {{ artifact_base_url }}/target.langpack.xpi
s3_key: {{ s3_prefix }}{{ platform }}/xpi/{{ locale }}.xpi
symbols:
artifact: {{ artifact_base_url }}/target.crashreporter-symbols.zip
s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/firefox-{{ version }}.crashreporter-symbols.zip
+
+ {% if platform == "win32" %}
+ buildid_info:
+ artifact: {{ artifact_base_url }}/target_info.txt
+ s3_key: {{ s3_prefix }}win32_info.txt
+ mar_tools_mar:
+ artifact: {{ artifact_base_url }}/mar.exe
+ s3_key: {{ s3_prefix }}mar-tools/win32/mar.exe
+ mar_tools_mbdiff:
+ artifact: {{ artifact_base_url }}/mbsdiff.exe
+ s3_key: {{ s3_prefix }}mar-tools/win32/mbsdiff.exe
+ {% endif %}
+
+ {% if platform == "win64" %}
+ buildid_info:
+ artifact: {{ artifact_base_url }}/target_info.txt
+ s3_key: {{ s3_prefix }}win64_info.txt
+ mar_tools_mar:
+ artifact: {{ artifact_base_url }}/mar.exe
+ s3_key: {{ s3_prefix }}mar-tools/win64/mar.exe
+ mar_tools_mbdiff:
+ artifact: {{ artifact_base_url }}/mbsdiff.exe
+ s3_key: {{ s3_prefix }}mar-tools/win64/mbsdiff.exe
+ {% endif %}
+
+ {% if platform == "linux-i686" %}
buildid_info:
artifact: {{ artifact_base_url }}/target_info.txt
s3_key: {{ s3_prefix }}linux_info.txt
mar_tools_mar:
artifact: {{ artifact_base_url }}/host/bin/mar
s3_key: {{ s3_prefix }}mar-tools/linux/mar
mar_tools_mbdiff:
artifact: {{ artifact_base_url }}/host/bin/mbsdiff
s3_key: {{ s3_prefix }}mar-tools/linux/mbsdiff
{% endif %}
{% if platform == "linux-x86_64" %}
- buildinfo:
- artifact: {{ artifact_base_url }}/target.json
- s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/firefox-{{ version }}.json
- mozinfo:
- artifact: {{ artifact_base_url }}/target.mozinfo.json
- s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/firefox-{{ version }}.mozinfo.json
- socorroinfo:
- artifact: {{ artifact_base_url }}/target.txt
- s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/firefox-{{ version }}.txt
- jsshell:
- artifact: {{ artifact_base_url }}/target.jsshell.zip
- s3_key: {{ s3_prefix }}jsshell-{{ platform }}.zip
- mozharness_package:
- artifact: {{ artifact_base_url }}/mozharness.zip
- s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/mozharness.zip
- xpi:
- artifact: {{ artifact_base_url }}/target.langpack.xpi
- s3_key: {{ s3_prefix }}{{ platform }}/xpi/{{ locale }}.xpi
- symbols:
- artifact: {{ artifact_base_url }}/target.crashreporter-symbols.zip
- s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/firefox-{{ version }}.crashreporter-symbols.zip
buildid_info:
artifact: {{ artifact_base_url }}/target_info.txt
s3_key: {{ s3_prefix }}linux64_info.txt
mar_tools_mar:
artifact: {{ artifact_base_url }}/host/bin/mar
s3_key: {{ s3_prefix }}mar-tools/linux64/mar
mar_tools_mbdiff:
artifact: {{ artifact_base_url }}/host/bin/mbsdiff
s3_key: {{ s3_prefix }}mar-tools/linux64/mbsdiff
{% endif %}
{% if platform == "mac" %}
- buildinfo:
- artifact: {{ artifact_base_url }}/firefox-{{ app_version }}.{{ locale }}.{{ platform }}.json
- s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/firefox-{{ version }}.json
- mozinfo:
- artifact: {{ artifact_base_url }}/firefox-{{ app_version }}.{{ locale }}.{{ platform }}.mozinfo.json
- s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/firefox-{{ version }}.mozinfo.json
- socorroinfo:
- artifact: {{ artifact_base_url }}/firefox-{{ app_version }}.{{ locale }}.{{ platform }}.txt
- s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/firefox-{{ version }}.txt
- jsshell:
- artifact: {{ artifact_base_url }}/jsshell-{{ platform }}.zip
- s3_key: {{ s3_prefix }}jsshell-{{ platform }}.zip
- mozharness_package:
- artifact: {{ artifact_base_url }}/mozharness.zip
- s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/mozharness.zip
- xpi:
- artifact: {{ artifact_base_url }}/firefox-{{ app_version }}.{{ locale }}.langpack.xpi
- s3_key: {{ s3_prefix }}{{ platform }}/xpi/{{ locale }}.xpi
- symbols:
- artifact: {{ artifact_base_url }}/firefox-{{ app_version }}.{{ locale }}.{{ platform }}.crashreporter-symbols.zip
- s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/Firefox {{ version }}.crashreporter-symbols.zip
buildid_info:
- artifact: {{ artifact_base_url }}/firefox-{{ app_version }}.{{ locale }}.{{ platform }}_info.txt
+ artifact: {{ artifact_base_url }}/target_info.txt
s3_key: {{ s3_prefix }}macosx64_info.txt
mar_tools_mar:
artifact: {{ artifact_base_url }}/mar
s3_key: {{ s3_prefix }}mar-tools/macosx64/mar
mar_tools_mbdiff:
artifact: {{ artifact_base_url }}/mbsdiff
s3_key: {{ s3_prefix }}mar-tools/macosx64/mbsdiff
{% endif %}
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/beetmover/en_us_repackage.yml.tmpl
@@ -0,0 +1,28 @@
+---
+metadata:
+ name: "Beet Mover Manifest"
+ description: "Maps artifact locations to s3 key names for the en-US locale"
+ owner: "release@mozilla.com"
+
+mapping:
+{% for locale in locales %}
+ {{ locale }}:
+ {% if platform == "win32" %}
+ package:
+ artifact: {{ artifact_base_url }}/target.zip
+ s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/firefox-{{ version }}.zip
+ {% endif %}
+
+ {% if platform == "win64" %}
+ package:
+ artifact: {{ artifact_base_url }}/target.zip
+ s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/firefox-{{ version }}.zip
+ {% endif %}
+
+ {% if platform == "mac" %}
+ package:
+ artifact: {{ artifact_base_url }}/target.dmg
+ s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/Firefox {{ version }}.dmg
+ {% endif %}
+
+{% endfor %}
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/beetmover/en_us_repackage_signing.yml.tmpl
@@ -0,0 +1,40 @@
+---
+metadata:
+ name: "Beet Mover Manifest"
+ description: "Maps artifact locations to s3 key names for the en-US locale"
+ owner: "release@mozilla.com"
+
+mapping:
+{% for locale in locales %}
+ {{ locale }}:
+ {% if platform == "win32" %}
+ 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
+ {% if "esr" not in version %}
+ stub_installer:
+ artifact: {{ artifact_base_url }}/target.stub-installer.exe
+ s3_key: {{ s3_prefix }}{{ platform }}/{{ locale }}/Firefox Setup Stub {{ version }}.exe
+ {% endif %}
+ {% endif %}
+
+ {% if 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" %}
+ complete_mar:
+ artifact: {{ artifact_base_url }}/target.complete.mar
+ s3_key: {{ s3_prefix }}update/{{ platform }}/{{ locale }}/firefox-{{ version }}.complete.mar
+ {% endif %}
+
+{% endfor %}