Use Pungi instead of Mash to generate repositories.

This commit is a significant change in Bodhi, as it alters the repository layout that Bodhi generates when mashing. It also enables Bodhi to create repositories of a new content type, modules. Many other new features of Pungi are now available to us as well, such as rich dependencies. fixes fedora-infra#653 fixes fedora-infra#887 fixes fedora-infra#909 fixes fedora-infra#1182 fixes fedora-infra#1219 fixes fedora-infra#1330 Signed-off-by: Adam Miller <maxamillion@fedoraproject.org> Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org> Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
puiterwijk · Oct 19, 2017 · bbb7cb3 · bbb7cb3
1 parent 9fccbda
commit bbb7cb3
Show file tree

Hide file tree

Showing 20 changed files with 1,058 additions and 930 deletions.
diff --git a/bodhi/server/config.py b/bodhi/server/config.py
@@ -318,15 +318,6 @@ class BodhiConfig(dict):
         'captcha.ttl': {
             'value': 300,
             'validator': int},
-        'compose_atomic_trees': {
-            'value': False,
-            'validator': _validate_bool},
-        'comps_dir': {
-            'value': os.path.join(os.path.dirname(__file__), '..', '..', 'masher', 'comps'),
-            'validator': unicode},
-        'comps_url': {
-            'value': 'https://git.fedorahosted.org/comps.git',
-            'validator': _validate_tls_url},
         'cors_connect_src': {
             'value': 'https://*.fedoraproject.org/ wss://hub.fedoraproject.org:9939/',
             'validator': unicode},
@@ -423,9 +414,6 @@ class BodhiConfig(dict):
         'mandatory_packager_groups': {
             'value': ['packager'],
             'validator': _generate_list_validator()},
-        'mash_conf': {
-            'value': '/etc/mash/mash.conf',
-            'validator': unicode},
         'mash_dir': {
             'value': None,
             'validator': _validate_none_or(_validate_path)},
@@ -474,6 +462,18 @@ class BodhiConfig(dict):
         'pkgdb_url': {
             'value': 'https://admin.fedoraproject.org/pkgdb',
             'validator': unicode},
+        'pungi.basepath': {
+            'value': '/etc/bodhi',
+            'validator': unicode},
+        'pungi.cmd': {
+            'value': '/usr/bin/pungi-koji',
+            'validator': _validate_path},
+        'pungi.conf.module': {
+            'value': 'pungi.module.conf',
+            'validator': unicode},
+        'pungi.conf.rpm': {
+            'value': 'pungi.rpm.conf',
+            'validator': unicode},
         'query_wiki_test_cases': {
             'value': False,
             'validator': _validate_bool},