Bug 1220641 - Push to mirrors prefix is too greedy. r=Callek,a=ritu DONTBUILD
authorRail Aliiev <rail@mozilla.com>
Mon, 02 Nov 2015 09:56:51 -0500
changeset 296641 6a65996ee241
parent 296640 f2f176ef9b45
child 296642 b87f9e2d6355
push id5269
push userraliiev@mozilla.com
push date2015-11-05 15:50 +0000
treeherdermozilla-beta@6a65996ee241 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek, ritu
bugs1220641
milestone43.0
Bug 1220641 - Push to mirrors prefix is too greedy. r=Callek,a=ritu DONTBUILD
testing/mozharness/scripts/release/antivirus.py
testing/mozharness/scripts/release/push-candidate-to-releases.py
--- a/testing/mozharness/scripts/release/antivirus.py
+++ b/testing/mozharness/scripts/release/antivirus.py
@@ -103,17 +103,17 @@ class AntivirusScan(BaseScript, Virtuale
                 "scan-files",
                 "cleanup-cache",
             ],
         )
         self.excludes = self.config.get('excludes', self.DEFAULT_EXCLUDES)
         self.dest_dir = self.CACHE_DIR
 
     def _get_candidates_prefix(self):
-        return "pub/{}/candidates/{}-candidates/build{}".format(
+        return "pub/{}/candidates/{}-candidates/build{}/".format(
             self.config['product'],
             self.config["version"],
             self.config["build_number"]
         )
 
     def _matches_exclude(self, keyname):
         for exclude in self.excludes:
             if re.search(exclude, keyname):
--- a/testing/mozharness/scripts/release/push-candidate-to-releases.py
+++ b/testing/mozharness/scripts/release/push-candidate-to-releases.py
@@ -92,24 +92,24 @@ class ReleasePusher(BaseScript, Virtuale
                 r"^.*/host.*$",
                 r"^.*/mar-tools/.*$",
                 r"^.*gecko-unsigned-unaligned.apk$",
                 r"^.*robocop.apk$",
                 r"^.*contrib.*"
             ]
 
     def _get_candidates_prefix(self):
-        return "pub/{}/candidates/{}-candidates/build{}".format(
+        return "pub/{}/candidates/{}-candidates/build{}/".format(
             self.config['product'],
             self.config["version"],
             self.config["build_number"]
         )
 
     def _get_releases_prefix(self):
-        return "pub/{}/releases/{}".format(
+        return "pub/{}/releases/{}/".format(
             self.config["product"],
             self.config["version"]
         )
 
     def _matches_exclude(self, keyname):
         for exclude in self.config["excludes"]:
             if re.search(exclude, keyname):
                 return True