Bug 1336514 - Publish jsshell-*.zip as part of release r=nthomas
MozReview-Commit-ID: 4N3trF9oQ6l
--- a/testing/mozharness/configs/beetmover/en_us_build.yml.tmpl
+++ b/testing/mozharness/configs/beetmover/en_us_build.yml.tmpl
@@ -14,17 +14,17 @@ mapping:
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
+ s3_key: {{ s3_prefix }}jsshell/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
--- a/testing/mozharness/scripts/release/antivirus.py
+++ b/testing/mozharness/scripts/release/antivirus.py
@@ -60,17 +60,16 @@ class AntivirusScan(BaseScript, Virtuale
r"^.*crashreporter.*$",
r"^.*\.zip(\.asc)?$",
r"^.*\.log$",
r"^.*\.txt$",
r"^.*\.asc$",
r"^.*/partner-repacks.*$",
r"^.*.checksums(\.asc)?$",
r"^.*/logs/.*$",
- r"^.*/jsshell.*$",
r"^.*json$",
r"^.*/host.*$",
r"^.*/mar-tools/.*$",
r"^.*robocop.apk$",
r"^.*contrib.*"
]
CACHE_DIR = 'cache'
--- a/testing/mozharness/scripts/release/beet_mover.py
+++ b/testing/mozharness/scripts/release/beet_mover.py
@@ -98,17 +98,16 @@ DEFAULT_EXCLUDES = [
r"^.*crashreporter.*$",
r"^.*\.zip(\.asc)?$",
r"^.*\.log$",
r"^.*\.txt$",
r"^.*\.asc$",
r"^.*/partner-repacks.*$",
r"^.*.checksums(\.asc)?$",
r"^.*/logs/.*$",
- r"^.*/jsshell.*$",
r"^.*json$",
r"^.*/host.*$",
r"^.*/mar-tools/.*$",
r"^.*robocop.apk$",
r"^.*contrib.*"
]
CACHE_DIR = 'cache'
--- a/testing/mozharness/scripts/release/generate-checksums.py
+++ b/testing/mozharness/scripts/release/generate-checksums.py
@@ -131,16 +131,17 @@ class ChecksumsGenerator(BaseScript, Vir
r"^.*\.tar\.bz2$",
r"^.*\.tar\.xz$",
r"^.*\.dmg$",
r"^.*\.bundle$",
r"^.*\.mar$",
r"^.*Setup.*\.exe$",
r"^.*\.xpi$",
r"^.*fennec.*\.apk$",
+ r"^.*/jsshell.*$",
]
def _get_bucket_name(self):
if self.config.get('bucket_name_full'):
return self.config['bucket_name_full']
suffix = "archive"
# Firefox has a special bucket, per https://github.com/mozilla-services/product-delivery-tools/blob/master/bucketmap.go
--- a/testing/mozharness/scripts/release/push-candidate-to-releases.py
+++ b/testing/mozharness/scripts/release/push-candidate-to-releases.py
@@ -39,17 +39,16 @@ class ReleasePusher(BaseScript, Virtuale
r"^.*tests.*$",
r"^.*crashreporter.*$",
r"^.*[^k]\.zip(\.asc)?$",
r"^.*\.log$",
r"^.*\.txt$",
r"^.*/partner-repacks.*$",
r"^.*.checksums(\.asc)?$",
r"^.*/logs/.*$",
- r"^.*/jsshell.*$",
r"^.*json$",
r"^.*/host.*$",
r"^.*/mar-tools/.*$",
r"^.*robocop.apk$",
r"^.*bouncer.apk$",
r"^.*contrib.*",
r"^.*/beetmover-checksums/.*$",
],