aboutsummaryrefslogtreecommitdiffstats
path: root/deployment
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2019-07-06 18:10:36 +0300
committerThomas Backlund <tmb@mageia.org>2019-07-06 18:10:36 +0300
commit4fb0aa36d08604c22bc55573f65f4a18b541df5a (patch)
tree694e9034821dd960321d06b6d23e19cf24f24c50 /deployment
parente994e68115d599f73df6821f8b2aef74b45fd21f (diff)
downloadpuppet-4fb0aa36d08604c22bc55573f65f4a18b541df5a.tar
puppet-4fb0aa36d08604c22bc55573f65f4a18b541df5a.tar.gz
puppet-4fb0aa36d08604c22bc55573f65f4a18b541df5a.tar.bz2
puppet-4fb0aa36d08604c22bc55573f65f4a18b541df5a.tar.xz
puppet-4fb0aa36d08604c22bc55573f65f4a18b541df5a.zip
drop duplicated rpmlint rules
Diffstat (limited to 'deployment')
-rw-r--r--deployment/mga_buildsystem/manifests/config.pp252
1 files changed, 12 insertions, 240 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp
index 04674fc5..5fa9ec49 100644
--- a/deployment/mga_buildsystem/manifests/config.pp
+++ b/deployment/mga_buildsystem/manifests/config.pp
@@ -372,236 +372,8 @@ class mga_buildsystem::config {
],
}
- # rpmlint check options for mageia <= 2
- $mga2_rpmlint = {
- 'config' => '/usr/share/rpmlint/config.mga2',
- 'path' => '/usr/bin/mga2-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',
- ],
- }
-
- # rpmlint check options for Mageia 3
- $mga3_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 Mageia 4
- $mga4_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 Mageia 5
- $mga5_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 Mageia 6
- $mga6_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 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 = {
+ # rpmlint check options for stable and cauldron
+ $mga_rpmlint = {
'config' => '/usr/share/rpmlint/config',
'path' => '/usr/bin/rpmlint',
'results' => [
@@ -694,13 +466,13 @@ class mga_buildsystem::config {
'upload' => {
'targets' => $cauldron_youri_upload_targets,
'checks' => {
- 'rpmlint' => $cauldron_rpmlint,
+ 'rpmlint' => $mga_rpmlint,
},
},
'todo' => {
'targets' => $cauldron_youri_todo_targets,
'checks' => {
- 'rpmlint' => $cauldron_rpmlint,
+ 'rpmlint' => $mga_rpmlint,
'version' => $cauldron_version_check,
},
},
@@ -724,13 +496,13 @@ class mga_buildsystem::config {
'upload' => {
'targets' => $mga6_youri_upload_targets,
'checks' => {
- 'rpmlint' => $mga6_rpmlint,
+ 'rpmlint' => $mga_rpmlint,
},
},
'todo' => {
'targets' => $std_youri_todo_targets,
'checks' => {
- 'rpmlint' => $mga6_rpmlint,
+ 'rpmlint' => $mga_rpmlint,
'version' => $std_version_check,
},
},
@@ -754,13 +526,13 @@ class mga_buildsystem::config {
'upload' => {
'targets' => $mga7_youri_upload_targets,
'checks' => {
- 'rpmlint' => $mga7_rpmlint,
+ 'rpmlint' => $mga_rpmlint,
},
},
'todo' => {
'targets' => $std_youri_todo_targets,
'checks' => {
- 'rpmlint' => $mga7_rpmlint,
+ 'rpmlint' => $mga_rpmlint,
'version' => $std_version_check,
},
},
@@ -786,13 +558,13 @@ class mga_buildsystem::config {
'upload' => {
'targets' => $infra_youri_upload_targets,
'checks' => {
- 'rpmlint' => $mga6_rpmlint,
+ 'rpmlint' => $mga_rpmlint,
},
},
'todo' => {
'targets' => $infra_youri_todo_targets,
'checks' => {
- 'rpmlint' => $mga6_rpmlint,
+ 'rpmlint' => $mga_rpmlint,
'version' => $infra_version_check,
},
},
@@ -819,13 +591,13 @@ class mga_buildsystem::config {
'upload' => {
'targets' => $infra_youri_upload_targets,
'checks' => {
- 'rpmlint' => $mga7_rpmlint,
+ 'rpmlint' => $mga_rpmlint,
},
},
'todo' => {
'targets' => $infra_youri_todo_targets,
'checks' => {
- 'rpmlint' => $mga7_rpmlint,
+ 'rpmlint' => $mga_rpmlint,
'version' => $infra_version_check,
},
},