Move retrieving the POC for each product to the data gathering part
This makes sense and allows the output of the script to be easier to share. Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
This commit is contained in:
parent
4a44a51ba5
commit
3c504653a7
1 changed files with 17 additions and 12 deletions
|
@ -582,6 +582,21 @@ class DistgitBugzillaSync:
|
||||||
products.add(self.env['namespace_to_product'][project['namespace']])
|
products.add(self.env['namespace_to_product'][project['namespace']])
|
||||||
project['products'] = list(products)
|
project['products'] = list(products)
|
||||||
|
|
||||||
|
products_poc = {}
|
||||||
|
for product in products:
|
||||||
|
owner = project["poc"]
|
||||||
|
# Check if the project is retired in PDC, and if so set assignee to orphan.
|
||||||
|
if _is_retired(product, project):
|
||||||
|
owner = 'orphan'
|
||||||
|
|
||||||
|
# Check if the Bugzilla ticket assignee has been manually overridden
|
||||||
|
override_yaml = self._get_override_yaml(project, self.session)
|
||||||
|
if override_yaml.get(product) \
|
||||||
|
and isinstance(override_yaml[product], str):
|
||||||
|
owner = override_yaml[product]
|
||||||
|
products_poc[product] = owner
|
||||||
|
project['products_poc'] = products_poc
|
||||||
|
|
||||||
self.pagure_projects[idx] = project
|
self.pagure_projects[idx] = project
|
||||||
|
|
||||||
@cache.cache_on_arguments()
|
@cache.cache_on_arguments()
|
||||||
|
@ -662,6 +677,7 @@ class DistgitBugzillaSync:
|
||||||
|
|
||||||
if not self.pagure_projects:
|
if not self.pagure_projects:
|
||||||
return
|
return
|
||||||
|
|
||||||
if self.env["verbose"]:
|
if self.env["verbose"]:
|
||||||
times["data structure end"] = time.time()
|
times["data structure end"] = time.time()
|
||||||
delta = times["data structure end"] - times["start"]
|
delta = times["data structure end"] - times["start"]
|
||||||
|
@ -698,22 +714,11 @@ class DistgitBugzillaSync:
|
||||||
print(f"Ignoring: {product}/{project['name']}")
|
print(f"Ignoring: {product}/{project['name']}")
|
||||||
continue
|
continue
|
||||||
|
|
||||||
owner = project["poc"]
|
|
||||||
# Check if the project is retired in PDC, and if so set assignee to orphan.
|
|
||||||
if _is_retired(product, project):
|
|
||||||
owner = 'orphan'
|
|
||||||
|
|
||||||
# Check if the Bugzilla ticket assignee has been manually overridden
|
|
||||||
override_yaml = self._get_override_yaml(project, self.session)
|
|
||||||
if override_yaml.get(product) \
|
|
||||||
and isinstance(override_yaml[product], str):
|
|
||||||
owner = override_yaml[product]
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
bugzilla.add_edit_component(
|
bugzilla.add_edit_component(
|
||||||
package=project["name"],
|
package=project["name"],
|
||||||
collection=product,
|
collection=product,
|
||||||
owner=owner,
|
owner=project["products_poc"][product],
|
||||||
description=project['summary'],
|
description=project['summary'],
|
||||||
qacontact=None,
|
qacontact=None,
|
||||||
cclist=project['watchers']
|
cclist=project['watchers']
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue