make default QA contact email address configurable

Signed-off-by: Nils Philippsen <nils@redhat.com>
This commit is contained in:
Nils Philippsen 2019-11-22 16:26:28 +01:00
parent 78434ffbfd
commit 2b7712f826
2 changed files with 7 additions and 4 deletions

View file

@ -1,5 +1,6 @@
environment = "staging" environment = "staging"
data_cache = "/var/tmp/pagure_sync_bz.json" data_cache = "/var/tmp/pagure_sync_bz.json"
default_qa_contact_email = "extras-qa@fedoraproject.org"
bz_maintainer_change_comment = """ bz_maintainer_change_comment = """
This package has changed maintainer in the Fedora. This package has changed maintainer in the Fedora.
Reassigning to the new maintainer of this component. Reassigning to the new maintainer of this component.

View file

@ -308,11 +308,13 @@ class BugzillaProxy:
raise raise
# Set the qacontact_email and name # Set the qacontact_email and name
default_qa_contact_email = self.config['default_qa_contact_email']
default_qa_contact = f"<default: {default_qa_contact_email.split('@', 1)[0]}@...>"
if qacontact: if qacontact:
qacontact_email = self._get_bugzilla_email(qacontact) qacontact_email = self._get_bugzilla_email(qacontact)
else: else:
qacontact_email = 'extras-qa@fedoraproject.org' qacontact = default_qa_contact
qacontact = '<default: extras-qa@...>' qacontact_email = default_qa_contact_email
pkg_key = package.lower() pkg_key = package.lower()
if pkg_key in product: if pkg_key in product:
@ -368,8 +370,8 @@ class BugzillaProxy:
for email in product[pkg_key][key]: for email in product[pkg_key][key]:
if email in self.inverted_user_cache: if email in self.inverted_user_cache:
from_fas_names.append(self.inverted_user_cache[email]) from_fas_names.append(self.inverted_user_cache[email])
elif email == 'extras-qa@fedoraproject.org': elif email == default_qa_contact_email:
from_fas_names.append("<default: extras-qa@...>") from_fas_names.append(default_qa_contact)
if from_fas_names: if from_fas_names:
if len(from_fas_names) < len(product[pkg_key][key]): if len(from_fas_names) < len(product[pkg_key][key]):
x = len(product[pkg_key][key]) - len(from_fas_names) x = len(product[pkg_key][key]) - len(from_fas_names)