aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2023-08-25 11:26:21 +0300
committerThomas Backlund <tmb@mageia.org>2023-08-25 11:26:21 +0300
commita46158d3973e9f95a00bb2ce3a920bea7a0a9945 (patch)
treec22592a3eff714fa953372659e248f54f49349c4
parent314c895b5b1f173761d7bc46122dba972a508601 (diff)
downloadpuppet-a46158d3973e9f95a00bb2ce3a920bea7a0a9945.tar
puppet-a46158d3973e9f95a00bb2ce3a920bea7a0a9945.tar.gz
puppet-a46158d3973e9f95a00bb2ce3a920bea7a0a9945.tar.bz2
puppet-a46158d3973e9f95a00bb2ce3a920bea7a0a9945.tar.xz
puppet-a46158d3973e9f95a00bb2ce3a920bea7a0a9945.zip
add mga9 and infra_9 configs
-rw-r--r--deployment/mga_buildsystem/manifests/config.pp82
-rw-r--r--modules/buildsystem/manifests/var/youri.pp12
2 files changed, 94 insertions, 0 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp
index b5ad538b..ecf7012d 100644
--- a/deployment/mga_buildsystem/manifests/config.pp
+++ b/deployment/mga_buildsystem/manifests/config.pp
@@ -302,6 +302,29 @@ class mga_buildsystem::config {
],
}
+ $mga9_youri_upload_targets = {
+ 'checks' => [
+ 'version',
+ 'tag',
+ 'acl',
+ 'rpmlint',
+ 'recency',
+ ],
+ 'actions' => [
+ 'sign',
+ 'install',
+ 'link',
+ 'archive',
+ 'mail',
+ ],
+ 'posts' => [
+ 'genhdlist2',
+ 'createrepo_mga9',
+ 'appstream_mga9',
+ 'mirror',
+ ],
+ }
+
# the list of checks, actions, posts for infra distros in youri-upload
$infra_youri_upload_targets = {
'checks' => [
@@ -554,6 +577,34 @@ class mga_buildsystem::config {
},
},
+ '9' => {
+ 'arch' => concat($std_arch, ['armv7hl', 'aarch64']),
+ 'mandatory_arch' => concat($std_arch, ['aarch64']),
+ 'no_media_cfg_update' => true,
+ 'medias' => $std_medias,
+ 'base_media' => $std_base_media,
+ 'branch' => 'Official',
+ 'version' => '9',
+ 'submit_allowed' => "${svn_root_packages}/updates/9",
+ 'backports_allowed' => "${svn_root_packages}/backports/9",
+ 'macros' => $std_macros,
+ 'youri' => {
+ 'upload' => {
+ 'targets' => $mga8_youri_upload_targets,
+ 'checks' => {
+ 'rpmlint' => $mga_rpmlint,
+ },
+ },
+ 'todo' => {
+ 'targets' => $std_youri_todo_targets,
+ 'checks' => {
+ 'rpmlint' => $mga_rpmlint,
+ 'version' => $std_version_check,
+ },
+ },
+ },
+ },
+
'infra_6' => {
'arch' => concat($std_arch, $arm32_arch),
'medias' => $infra_medias,
@@ -646,6 +697,37 @@ class mga_buildsystem::config {
},
'no_mirror' => true,
},
+
+ 'infra_9' => {
+ 'arch' => concat($std_arch, ['armv7hl', 'aarch64']),
+ 'medias' => $infra_medias,
+ 'base_media' => [ '9/core/release', '9/core/updates', 'infra/updates' ],
+ 'branch' => 'Official',
+ 'version' => '9',
+ 'submit_allowed' => "${svn_root_packages}/updates/infra_9",
+ 'macros' => $std_macros,
+ 'based_on' => {
+ '9' => {
+ 'core' => [ 'release', 'updates' ],
+ },
+ },
+ 'youri' => {
+ 'upload' => {
+ 'targets' => $infra_youri_upload_targets,
+ 'checks' => {
+ 'rpmlint' => $mga_rpmlint,
+ },
+ },
+ 'todo' => {
+ 'targets' => $std_youri_todo_targets,
+ 'checks' => {
+ 'rpmlint' => $mga_rpmlint,
+ 'version' => $infra_version_check,
+ },
+ },
+ },
+ 'no_mirror' => true,
+ },
}
}
$checks_tag_options = {
diff --git a/modules/buildsystem/manifests/var/youri.pp b/modules/buildsystem/manifests/var/youri.pp
index 89531dba..4e15ba48 100644
--- a/modules/buildsystem/manifests/var/youri.pp
+++ b/modules/buildsystem/manifests/var/youri.pp
@@ -278,6 +278,12 @@ class buildsystem::var::youri(
'command' => 'createrepo_c --no-database --update --workers=10 --zck --zck-dict-dir /usr/share/mageia-repo-zdicts/mga7/',
},
},
+ 'createrepo_mga9' => {
+ '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' => {
@@ -302,6 +308,12 @@ class buildsystem::var::youri(
'command' => '/distrib/appstream/appstream-8-modifyrepo.sh',
},
},
+ 'appstream_mga9' => {
+ 'class' => 'Youri::Submit::Post::RunOnModifiedMedia',
+ 'options' => {
+ 'command' => '/distrib/appstream/appstream-9-modifyrepo.sh',
+ },
+ },
'appstream_cauldron' => {
'class' => 'Youri::Submit::Post::RunOnModifiedMedia',
'options' => {