add configs for mga7

2 files changed, 99 insertions, 2 deletions

diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp
index 1c9407f6..a12a0c39 100644
--- a/deployment/mga_buildsystem/manifests/config.pp
+++ b/deployment/mga_buildsystem/manifests/config.pp
@@ -264,7 +264,29 @@ class mga_buildsystem::config {
             'mirror',
         ],
     }
-    
+
+    $mga7_youri_upload_targets = {
+        'checks'  => [
+            'version',
+            'tag',
+            'acl',
+            'rpmlint',
+            'recency',
+        ],
+        'actions' => [
+            'sign',
+            'install',
+            'link',
+            'archive',
+            'mail',
+        ],
+        'posts'   => [
+            'genhdlist2',
+            'createrepo_mga7',
+            'mirror',
+        ],
+    }
+
     # the list of checks, actions, posts for infra distros in youri-upload
     $infra_youri_upload_targets = {
         'checks'  => [
@@ -533,6 +555,46 @@ class mga_buildsystem::config {
             'udev-rule-in-etc',
         ],
     }
+
+    # rpmlint check options for Mageia 7
+    $mga7_rpmlint = {
+        'config'  => '/usr/share/rpmlint/config',
+        'path'    => '/usr/bin/rpmlint',
+        'results' => [
+            'buildprereq-use',
+            'no-description-tag',
+            'no-summary-tag',
+            'non-standard-group',
+            'non-xdg-migrated-menu',
+            'percent-in-conflicts',
+            'percent-in-dependency',
+            'percent-in-obsoletes',
+            'percent-in-provides',
+            'summary-ended-with-dot',
+            'unexpanded-macro',
+            'unknown-lsb-keyword',
+            'malformed-line-in-lsb-comment-block',
+            'empty-%postun',
+            'empty-%post',
+            'invalid-desktopfile',
+            'standard-dir-owned-by-package',
+            'use-tmp-in-%postun',
+            'bogus-variable-use-in-%posttrans',
+            'dir-or-file-in-usr-local',
+            'dir-or-file-in-tmp',
+            'dir-or-file-in-mnt',
+            'dir-or-file-in-opt',
+            'dir-or-file-in-home',
+            'dir-or-file-in-var-local',
+            'tmpfiles-conf-in-etc',
+            'non-ghost-in-run',
+            'non-ghost-in-var-run',
+            'non-ghost-in-var-lock',
+            'systemd-unit-in-etc',
+            'udev-rule-in-etc',
+        ],
+    }
+
     # rpmlint check options for cauldron
     $cauldron_rpmlint = {
         'config'  => '/usr/share/rpmlint/config',
@@ -617,7 +679,7 @@ class mga_buildsystem::config {
                 'medias'              => $std_medias,
                 'base_media'          => $std_base_media,
                 'branch'              => 'Devel',
-                'version'             => '7',
+                'version'             => '8',
                 'submit_allowed'      => "${svn_root_packages}/cauldron",
                 'macros'              => $std_macros,
                 'repo_allow_from_ips' => $repo_allow_from_ips,
@@ -812,6 +874,35 @@ class mga_buildsystem::config {
                 },
             },
 
+            '7'        => {
+                'arch'                => concat($std_arch, ['armv7hl', 'aarch64']),
+                'mandatory_arch'      => concat($std_arch, ['armv7hl', 'aarch64']),
+                'no_media_cfg_update' => true,
+                'medias'              => $std_medias,
+                'base_media'          => $std_base_media,
+                'branch'              => 'Official',
+                'version'             => '7',
+                'submit_allowed'      => "${svn_root_packages}/updates/7",
+                'backports_allowed'   => "${svn_root_packages}/backports/7",
+                'macros'              => $std_macros,
+                'repo_allow_from_ips' => $repo_allow_from_ips,
+                'repo_allow_from_domains' => $repo_allow_from_domains,
+                'youri'               => {
+                    'upload' => {
+                        'targets' => $mga7_youri_upload_targets,
+                        'checks'  => {
+                            'rpmlint' => $mga7_rpmlint,
+                        },
+                    },
+                    'todo'   => {
+                        'targets' => $std_youri_todo_targets,
+                        'checks'  => {
+                            'rpmlint' => $mga7_rpmlint,
+                            'version' => $std_version_check,
+                        },
+                    },
+                },
+            },
 
             'infra_1'  => {
                 'arch'           => $std_arch,
diff --git a/modules/buildsystem/manifests/var/youri.pp b/modules/buildsystem/manifests/var/youri.pp
index 644968fd..32607e7b 100644
--- a/modules/buildsystem/manifests/var/youri.pp
+++ b/modules/buildsystem/manifests/var/youri.pp
@@ -260,6 +260,12 @@ class buildsystem::var::youri(
                         'command' => 'createrepo_c --no-database --update --workers=10',
                     },
                 },
+                'createrepo_mga7' => {
+                    'class' => 'Youri::Submit::Post::RunOnModifiedMedia',
+                    'options' => {
+                        'command' => 'createrepo_c --no-database --update --workers=10 --zck --zck-dict-dir /usr/share/mageia-repo-zdicts/mga7/',
+                    },
+                },
                 'createrepo_cauldron' => {
                     'class' => 'Youri::Submit::Post::RunOnModifiedMedia',
                     'options' => {