infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

bodhi-backend: Fix bug in owner-pagure-sync script

Browse source 
Signed-off-by: Lenka Segura <lsegura@redhat.com>
This commit is contained in:
Lenka Segura 2024-05-22 22:01:08 +02:00
parent 9be1a293e7
commit a7bdb31bfc
1 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,10 +22,10 @@ from urllib.parse import urljoin
import multiprocessing.pool import multiprocessing.pool
from math import ceil from math import ceil
from functools import partial from functools import partial
import re
import requests import requests
import koji import koji
import re
from requests.adapters import HTTPAdapter from requests.adapters import HTTPAdapter
from requests.packages.urllib3.util.retry import Retry from requests.packages.urllib3.util.retry import Retry
@ -233,12 +233,6 @@ def get_project_name_and_its_active_branches(session, namespace, active_releases
:return: a tuple containing the string of the project and a list of :return: a tuple containing the string of the project and a list of
branches branches
""" """
project_branches_url = '{0}component-branches/'.format(PDC_URL)
params = dict(
global_component=project_name,
type=PDC_TYPES[namespace],
active=True,
)
if verbose: if verbose:
print('- Querying pagure distgit for package branches') print('- Querying pagure distgit for package branches')
project_branches = get_project_branches(session, namespace, project_name) project_branches = get_project_branches(session, namespace, project_name)
@ -273,17 +267,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):
if bool(response):
names = set()
for project in response.json()['projects']:
names.add(project['name'])
return names
else:
print("Failed to talk to %r %r." % ( print("Failed to talk to %r %r." % (
response.request.url, response), file=sys.stderr) response.request.url, response), file=sys.stderr)
return set() return set()
names = set()
for project in response.json()['projects']:
names.add(project['name'])
return names
def get_pagure_project_branches(namespace, active_releases, lookaside, package=None, verbose=False): def get_pagure_project_branches(namespace, active_releases, lookaside, package=None, verbose=False):
""" """
@ -496,7 +492,7 @@ if __name__ == '__main__':
print('Querying for all the projects with the namespace "{0}"' print('Querying for all the projects with the namespace "{0}"'
.format(namespace)) .format(namespace))
namespace_to_projects[namespace] = \ namespace_to_projects[namespace] = \
get_pagure_project_branches(namespace, package=package, verbose=verbose) get_pagure_project_branches(namespace, active_releases, lookaside, package=package, verbose=verbose)
for tag, info in list(tag_info.items()): for tag, info in list(tag_info.items()):
if verbose: if verbose: