diff options
| -rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 6 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/var/distros.pp | 1 | ||||
| -rw-r--r-- | modules/buildsystem/templates/iurt.conf | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index 0a242ee1..3526bf1e 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -19,6 +19,7 @@ class mga_buildsystem::config { uploadmail_to => "packages-commits@ml.${::domain}", } + $std_arch = ['i586', 'x86_64'] $std_repos = ['release','updates_testing','backports_testing','backports','updates'] $std_medias = { 'core' => $std_repos, @@ -32,26 +33,31 @@ class mga_buildsystem::config { class { 'buildsystem::var::distros': distros => { 'cauldron' => { + 'arch' => $std_arch, 'medias' => $std_medias, 'base_media' => $std_base_media, }, '1' => { + 'arch' => $std_arch, 'medias' => $std_medias, 'base_media' => $std_base_media, }, '2' => { + 'arch' => $std_arch, 'medias' => $std_medias, 'base_media' => $std_base_media, }, 'infra_1' => { + 'arch' => $std_arch, 'medias' => $infra_medias, 'base_media' => $std_base_media, }, 'infra_2' => { + 'arch' => $std_arch, 'medias' => $infra_medias, 'base_media' => $std_base_media, }, diff --git a/modules/buildsystem/manifests/var/distros.pp b/modules/buildsystem/manifests/var/distros.pp index 58f63417..d815b18a 100644 --- a/modules/buildsystem/manifests/var/distros.pp +++ b/modules/buildsystem/manifests/var/distros.pp @@ -5,6 +5,7 @@ # - medias: an hash containing the different medias / repositories # - base_media: a list of medias that will be used by iurt to build # the chroots +# - arch: list of arch supported by this distro class buildsystem::var::distros( $distros ) { } diff --git a/modules/buildsystem/templates/iurt.conf b/modules/buildsystem/templates/iurt.conf index 3b71bb49..8536d89f 100644 --- a/modules/buildsystem/templates/iurt.conf +++ b/modules/buildsystem/templates/iurt.conf @@ -1,6 +1,6 @@ <%- distro = scope.lookupvar('buildsystem::var::distros::distros')[@distribution] -%> { - supported_arch => [ 'i586', 'x86_64' ], + supported_arch => [ '<%= distro['arch'].join("', '") %>' ], all_media =>{ <%- distro['medias'].each{|media, repos| -%> '<%= media %>' => [ '<%= repos.join("', '") %>' ], |