Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Code improvements

Browse source 
Signed-off-by: Lenka Segura <lsegura@redhat.com>
This commit is contained in:
Lenka Segura 2024-04-23 11:17:48 +02:00 • committed by zlopez
parent 7fde6612e5
commit d1a79b87dd
1 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

22
roles/bodhi2/backend/templates/owner-sync-pagure.j2
View file

@ -193,9 +193,7 @@ def get_active_releases_from_bodhi():
rv = requests.get(bodhi_url, timeout=60) rv = requests.get(bodhi_url, timeout=60)
if not rv.ok: if rv.ok:
return []
active_releases = [] active_releases = []
rv_json = rv.json() rv_json = rv.json()
if rv_json['releases']: if rv_json['releases']:
@ -203,7 +201,7 @@ def get_active_releases_from_bodhi():
if re.match(r'^(f|epel)\d{1,2}$', release['branch']): if re.match(r'^(f|epel)\d{1,2}$', release['branch']):
active_releases.append(release['branch']) active_releases.append(release['branch'])
return list(set(active_releases)) return list(set(active_releases))
return []
def get_project_branches(session, namespace, project_name): def get_project_branches(session, namespace, project_name):
""" """
@ -224,13 +222,13 @@ def get_project_branches(session, namespace, project_name):
get_branches_url, headers=headers, timeout=60) get_branches_url, headers=headers, timeout=60)
rv_json = rv.json() rv_json = rv.json()
if not rv.ok: if rv.ok:
return rv_json.get("branches", ())
# When specific namespace has no branches, API returns error "Project not found". # When specific namespace has no branches, API returns error "Project not found".
# Do not fail. Return "no branches found" instead. # Do not fail. Return "no branches found" instead.
return project_name, [] return project_name, []
return rv_json.get("branches", ())
def get_project_name_and_its_active_branches(session, namespace, active_releases, def get_project_name_and_its_active_branches(session, namespace, active_releases,
lookaside, project_name, verbose=False): lookaside, project_name, verbose=False):
@ -273,17 +271,19 @@ def get_pagure_project_names_from_page(session, namespace, page,
if verbose: if verbose:
print('- Querying {0}'.format(url)) print('- Querying {0}'.format(url))
response = session.get(url, verify=VERIFY, timeout=120) response = session.get(url, verify=VERIFY, timeout=120)
if not bool(response):
print("Failed to talk to %r %r." % (
response.request.url, response), file=sys.stderr)
return set()
if bool(response):
names = set() names = set()
for project in response.json()['projects']: for project in response.json()['projects']:
names.add(project['name']) names.add(project['name'])
return names return names
else:
print("Failed to talk to %r %r." % (
response.request.url, response), file=sys.stderr)
return set()
def get_pagure_project_branches(namespace, package=None, verbose=False): def get_pagure_project_branches(namespace, package=None, verbose=False):
""" """