Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/buildfarm/release/release-runner.py b/buildfarm/release/release-runner.py
- index d25e5c6..18640ea 100755
- --- a/buildfarm/release/release-runner.py
- +++ b/buildfarm/release/release-runner.py
- @@ -5,6 +5,7 @@ import time
- import logging
- import sys
- import os
- +import re
- import subprocess
- import hashlib
- import functools
- @@ -69,9 +70,12 @@ def bump_version(version):
- return split_by.join(v)
- +def matches(name, patterns):
- + return any([re.search(p, name) for p in patterns])
- +
- class ReleaseRunner(object):
- def __init__(self, api_root=None, username=None, password=None,
- - timeout=60):
- + timeout=60, release_patterns=None):
- self.new_releases = []
- self.releases_api = Releases((username, password), api_root=api_root,
- timeout=timeout)
- @@ -79,13 +83,22 @@ class ReleaseRunner(object):
- timeout=timeout)
- self.release_l10n_api = ReleaseL10n((username, password),
- api_root=api_root, timeout=timeout)
- + self.release_patterns = release_patterns
- def get_release_requests(self):
- new_releases = self.releases_api.getReleases()
- if new_releases['releases']:
- - self.new_releases = [self.release_api.getRelease(name) for name in
- - new_releases['releases']]
- - return True
- +
- + new_releases = [self.release_api.getRelease(name) for name in
- + new_releases['releases']]
- + our_releases = [r for r in new_releases if
- + matches(r, self.release_patterns)]
- + if our_releases
- + self.new_releases = new_releases
- + return True
- + else:
- + log.info("No releases to handle in %s", new_releases)
- + return False
- else:
- log.info("No new releases: %s" % new_releases)
- return False
- @@ -412,7 +425,11 @@ def main(options):
- # TODO: replace release sanity with direct checks of en-US and l10n revisions (and other things if needed)
- - rr = ReleaseRunner(api_root=api_root, username=username, password=password)
- + release_patterns = [
- + r"Firefox-\d+\.0b\d+-build\d+"
- + ]
- + rr = ReleaseRunner(api_root=api_root, username=username, password=password,
- + release_patterns=release_patterns)
- scheduler = Scheduler(tc_config)
- index = Index(tc_config)
- queue = Queue(tc_config)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement