commit d90609d6d89709b30bad495056df50a86f399b13
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Nov 19 19:30:47 2020 +0100
Sync pkgdb02
roles/pkgdb2/templates/pkgdb2.cfg | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
---
diff --git a/roles/pkgdb2/templates/pkgdb2.cfg b/roles/pkgdb2/templates/pkgdb2.cfg
index 5c8e048..89a0a38 100644
--- a/roles/pkgdb2/templates/pkgdb2.cfg
+++ b/roles/pkgdb2/templates/pkgdb2.cfg
@@ -25,9 +25,9 @@ AUTOAPPROVE_PKGERS = []
#### FAS group for the pkgdb admins
{% if env == 'staging' %}
-ADMIN_GROUP = ['cvsadmin']
+ADMIN_GROUP = ['sysadmin-releng']
{% else %}
-ADMIN_GROUP = ['sysadmin-main', 'cvsadmin']
+ADMIN_GROUP = ['sysadmin-main', 'sysadmin-releng']
{% endif %}
# Current packager group in RPM Fusion
@@ -69,7 +69,7 @@ PKGDB2_BUGZILLA_PASSWORD = '{{ bugzilla_password }}'
# Settings specific to the ``pkgdb-sync-bugzilla`` script/cron
PKGDB2_BUGZILLA_NOTIFY_EMAIL = [
'root(a)rpmfusion.org']
-BUGZILLA_COMPONENT_API = "component.get"
+BUGZILLA_COMPONENT_API = "getcomponentsdetails"
PKGDB2_BUGZILLA_NOTIFY_USER = '{{ bugzilla_user }}'
PKGDB2_BUGZILLA_NOTIFY_PASSWORD = '{{ bugzilla_password }}'
PKGDB2_BUGZILLA_DRY_RUN = False
@@ -179,16 +179,20 @@ FEDOCAL_CALENDAR_SHIELD = 'vacation'
REPO_MAP = [
('rawhide-free',
'free/fedora/development/rawhide/Everything/source/SRPMS/'),
('rawhide-nonfree',
'nonfree/fedora/development/rawhide/Everything/source/SRPMS/'),
- ('f27-free', 'free/fedora/development/27/Everything/source/SRPMS/'),
- ('f27-nonfree',
'nonfree/fedora/development/27/Everything/source/SRPMS/'),
- ('f26-free', 'free/fedora/releases/26/Everything/source/SRPMS/'),
- ('f26-free-up', 'free/fedora/updates/26/SRPMS/'),
- ('f26-nonfree',
'nonfree/fedora/releases/26/Everything/source/SRPMS/'),
- ('f26-nonfree-up', 'nonfree/fedora/updates/26/SRPMS/'),
- ('f25-free', 'free/fedora/releases/25/Everything/source/SRPMS/'),
- ('f25-free-up', 'free/fedora/updates/25/SRPMS/'),
- ('f25-nonfree',
'nonfree/fedora/releases/25/Everything/source/SRPMS/'),
- ('f25-nonfree-up', 'nonfree/fedora/updates/25/SRPMS/'),
+{% if env == 'staging' %}
+ ('f34-free', 'free/fedora/development/34/Everything/source/SRPMS/'),
+ ('f34-nonfree',
'nonfree/fedora/development/34/Everything/source/SRPMS/'),
+{% endif %}
+ ('f33-free', 'free/fedora/releases/33/Everything/source/SRPMS/'),
+ ('f33-free-up', 'free/fedora/updates/33/SRPMS/'),
+ ('f33-nonfree',
'nonfree/fedora/releases/33/Everything/source/SRPMS/'),
+ ('f33-nonfree-up', 'nonfree/fedora/updates/33/SRPMS/'),
+ ('f32-free', 'free/fedora/releases/32/Everything/source/SRPMS/'),
+ ('f32-free-up', 'free/fedora/updates/32/SRPMS/'),
+ ('f32-nonfree',
'nonfree/fedora/releases/32/Everything/source/SRPMS/'),
+ ('f32-nonfree-up', 'nonfree/fedora/updates/32/SRPMS/'),
+ ('el8-free', 'free/el/updates/8/SRPMS/'),
+ ('el8-nonfree', 'nonfree/el/updates/8/SRPMS/'),
('el7-free', 'free/el/updates/7/SRPMS/'),
('el7-nonfree', 'nonfree/el/updates/7/SRPMS/'),
('el6-free', 'free/el/updates/6/SRPMS/'),