Bug 1263976 - Adjust release-runner.py release patterns for mozilla-release r=rail
authorMihai Tabara <mtabara@mozilla.com>
Thu, 14 Apr 2016 17:40:27 -0400
changeset 6711 cfed49693bb5496ae80ac1444fddf5f01e587ec7
parent 6710 bf92baa7146814d920b845d349c1eb18972ef64b
child 6713 b76d94144b30688727e7e3c4da1fb5902148a19c
push id5013
push userraliiev@mozilla.com
push dateThu, 14 Apr 2016 21:41:23 +0000
reviewersrail
bugs1263976
Bug 1263976 - Adjust release-runner.py release patterns for mozilla-release r=rail
buildfarm/release/release-runner.py
--- a/buildfarm/release/release-runner.py
+++ b/buildfarm/release/release-runner.py
@@ -47,21 +47,24 @@ ALL_FILES = set([
     '.complete.mar',
     '.exe',
     '.dmg',
     'i686.tar.bz2',
     'x86_64.tar.bz2',
 ])
 
 
-# temporary regex to filter out anything but firefox beta releases within
-# release promotion. Once migration from buildbot to promotion is completed
-# for all types of releases, we will backout this filtering  - bug 1252333
+# temporary regex to filter out anything but mozilla-beta and mozilla-release
+# within release promotion. Once migration to release promotion is completed
+# for all types of releases, we will backout this filtering
+# regex beta tracking bug is 1252333,
+# regex release tracking bug is 1263976
 RELEASE_PATTERNS = [
-    r"Firefox-\d+\.0b\d+-build\d+"
+    r"Firefox-\d+\.0b\d+-build\d+",
+    r"Firefox-\d+\.\d+(\.\d+)?-build\d+"
 ]
 
 
 class SanityException(Exception):
     pass
 
 
 # FIXME: the following function should be removed and we should use
@@ -79,27 +82,29 @@ def bump_version(version):
         v.append("0")
     v[-1] = str(int(v[-1]) + 1)
     return split_by.join(v)
 
 
 def matches(name, patterns):
     return any([re.search(p, name) for p in patterns])
 
+
 def is_candidate_release(channels):
     """determine if this is a candidate release or not
 
     Because ship-it can not tell us if this is a candidate release (yet!), we assume it is when we
     have determined, based on version, that we are planning to ship to more than one update_channel
     e.g. for candidate releases we have:
      1) one channel to test the 'candidate' release with: to 'beta' channel users
      2) once verified, we ship to the main channel: to 'release' channel users
     """
     return len(channels) > 1
 
+
 def update_channels(version, mappings):
     """Return a list of update channels for a version using version mapping
 
     >>> update_channels("40.0", [(r"^\d+\.0$", ["beta", "release"]), (r"^\d+\.\d+\.\d+$", ["release"])])
     ["beta", "release"]
     >>> update_channels("40.0.1", [(r"^\d+\.0$", ["beta", "release"]), (r"^\d+\.\d+\.\d+$", ["release"])])
     ["release"]