diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-05-23 15:05:39 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-05-23 15:05:39 +0000 |
| commit | 671f605f00bc83d05a1190bfaea1b03e3d4cb135 (patch) | |
| tree | f2c87b7baa13fd6810b3e199b85b19125c66187e /modules | |
| parent | 9a20a46ee4d1f91ee9895f9e567548742237cbc1 (diff) | |
| download | puppet-671f605f00bc83d05a1190bfaea1b03e3d4cb135.tar puppet-671f605f00bc83d05a1190bfaea1b03e3d4cb135.tar.gz puppet-671f605f00bc83d05a1190bfaea1b03e3d4cb135.tar.bz2 puppet-671f605f00bc83d05a1190bfaea1b03e3d4cb135.tar.xz puppet-671f605f00bc83d05a1190bfaea1b03e3d4cb135.zip | |
buildsystem: generate mgarepo.conf using $distros
Use settings from buildsystem::var::distros to create mgarep.conf.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/buildsystem/manifests/var/distros.pp | 8 | ||||
| -rw-r--r-- | modules/buildsystem/templates/mgarepo.conf | 54 |
2 files changed, 28 insertions, 34 deletions
diff --git a/modules/buildsystem/manifests/var/distros.pp b/modules/buildsystem/manifests/var/distros.pp index 30d51f3d..87f78e19 100644 --- a/modules/buildsystem/manifests/var/distros.pp +++ b/modules/buildsystem/manifests/var/distros.pp @@ -32,6 +32,14 @@ # 'branch' => 'Devel', # # Version of the distribution # 'version' => '3', +# # SVN Urls allowed to submit +# 'submit_allowed' => 'svn://svn.something/svn/packages/cauldron', +# # rpm macros to set when build source package +# 'macros' => { +# 'distsuffix' => '.mga', +# 'distribution' => 'Mageia', +# 'vendor' => 'Mageia.Org', +# } # }, # } class buildsystem::var::distros( diff --git a/modules/buildsystem/templates/mgarepo.conf b/modules/buildsystem/templates/mgarepo.conf index d6a779c7..d92c6cd1 100644 --- a/modules/buildsystem/templates/mgarepo.conf +++ b/modules/buildsystem/templates/mgarepo.conf @@ -38,47 +38,33 @@ iurt = Mageia build bot <mageia-sysadm@<%= domain %>> default = <%= default_distro %> host = <%= scope.lookupvar('buildsystem::var::mgarepo::submit_host') %> -[submit cauldron] -target = <%= sched_home_dir %>/repsys/srpms -allowed = svn://svn.<%= domain %>/svn/packages/cauldron -rpm-macros = global cauldron - -[submit 1] -target = <%= sched_home_dir %>/repsys/srpms -allowed = svn://svn.<%= domain %>/svn/packages/updates/1 -rpm-macros = global 1 - -[submit 2] -target = <%= sched_home_dir %>/repsys/srpms -allowed = svn://svn.<%= domain %>/svn/packages/updates/2 -rpm-macros = global 2 - -[submit infra_1] +<%- + distros.each{|d, distro| +-%> +[submit <%= d %>] target = <%= sched_home_dir %>/repsys/srpms -allowed = svn://svn.mageia.org/svn/packages/ -rpm-macros = global 1 +allowed = <%= distro['submit_allowed'] %> +rpm-macros = global <%= d %> -[submit infra_2] -target = <%= sched_home_dir %>/repsys/srpms -allowed = svn://svn.mageia.org/svn/packages/ -rpm-macros = global 2 +<%- + } +-%> [macros global] -distsuffix = .mga # mkrel definition to be removed when rpm-setup is updated on main build node mkrel(c:) = %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}%{?distsuffix:%distsuffix}%{?!distsuffix:.mga}%{?distro_release:%distro_release} -distribution = Mageia -vendor = Mageia.Org -_real_vendor = mageia - -[macros cauldron] -distro_release = 3 -[macros 1] -distro_release = 1 - -[macros 2] -distro_release = 2 +<%- + distros.each{|d, distro| +-%> +[macros <%= d %>] +distro_release = <%= distro['version'] %> +<%- + distro['macros'].each{|macro, value| + -%><%= macro %> = <%= value %> + <%- } %> +<%- } +%> [helper] create-srpm = /usr/share/repsys/create-srpm |