From e76b37eee65f302f5218d4b18c278136f1cd627b Mon Sep 17 00:00:00 2001 From: Tomas Tomecek Date: Apr 27 2017 13:04:29 +0000 Subject: use f26 primarily, fallback to master Signed-off-by: Tomas Tomecek --- diff --git a/modularity/module_deps_differ.py b/modularity/module_deps_differ.py index a95dc36..53a2d9a 100755 --- a/modularity/module_deps_differ.py +++ b/modularity/module_deps_differ.py @@ -6,7 +6,8 @@ import re SUPPORTED_MODULES = ['perl', 'base-runtime', 'common-build-dependencies-bootstrap', 'common-build-dependencies'] -STREAM = 'master' +FALLBACK_STREAM = 'master' +STREAM = 'f26' REPO_F26 = "http://ftp.fi.muni.cz/pub/linux/fedora/linux/development/26/Everything/x86_64/os/" REPO_F26_SOURCE = "http://ftp.fi.muni.cz/pub/linux/fedora/linux/development/26/Everything/source/tree/" ARCH = 'x86_64' @@ -15,9 +16,21 @@ ARCH = 'x86_64' # TODO: solve architecture! - as option? +p = None + + +def get_pdc_client(): + """ cache PDCClient instance """ + global p + if p is None: + p = PDCClient('https://pdc.fedoraproject.org/rest_api/v1/', develop=True, ssl_verify=True) + return p + + class ModuleDepsDiffer(object): def __init__(self, args): + self.p = get_pdc_client() self.repos = dict() self.repo_provides = dict() # TODO: get this from args @@ -31,18 +44,23 @@ class ModuleDepsDiffer(object): def get_repo_urls(self): for repo in SUPPORTED_MODULES: - p = PDCClient('https://pdc.fedoraproject.org/rest_api/v1/', develop=True, ssl_verify=True) - module_name = repo stream = STREAM repo_url_template = "https://kojipkgs.fedoraproject.org/repos/{}" - j = p['unreleasedvariants']( + j = self.p['unreleasedvariants']( variant_name=module_name, variant_type="module", variant_version=stream, active=True ) - # TODO: get latest + if not j["results"]: + # fallback + j = self.p['unreleasedvariants']( + variant_name=module_name, + variant_type="module", + variant_version=FALLBACK_STREAM, + active=True + ) latest = max(j["results"], key=lambda x:x['variant_release']) repo_url = repo_url_template.format(latest["koji_tag"]) self.repos[repo] = str(repo_url + '/latest/' + ARCH)