From 941f7e3d093e802483ef615b4fa70a03bfc2bb30 Mon Sep 17 00:00:00 2001 From: Nicolas Vigier Date: Thu, 23 May 2013 15:05:11 +0000 Subject: buildsystem: use common iurt config file for all distros All distributions now use the same template file for their iurt configuration file. The 'base_media' value has been added in the distributions configuration in buildsystem::var::distros to allow setting in iurt configuration the base_media that will be used to generate chroots. The iurt configuration now also contains all the medias in 'all_media', instead of only the 'release' medias previously. --- deployment/mga_buildsystem/manifests/config.pp | 6 +++++ modules/buildsystem/manifests/iurt/config.pp | 2 +- modules/buildsystem/manifests/var/distros.pp | 2 ++ modules/buildsystem/templates/iurt.conf | 29 ++++++++++++++++++++++++ modules/buildsystem/templates/iurt/1.conf | 23 ------------------- modules/buildsystem/templates/iurt/2.conf | 23 ------------------- modules/buildsystem/templates/iurt/cauldron.conf | 23 ------------------- modules/buildsystem/templates/iurt/infra_1.conf | 13 ----------- modules/buildsystem/templates/iurt/infra_2.conf | 13 ----------- 9 files changed, 38 insertions(+), 96 deletions(-) create mode 100644 modules/buildsystem/templates/iurt.conf delete mode 100644 modules/buildsystem/templates/iurt/1.conf delete mode 100644 modules/buildsystem/templates/iurt/2.conf delete mode 100644 modules/buildsystem/templates/iurt/cauldron.conf delete mode 100644 modules/buildsystem/templates/iurt/infra_1.conf delete mode 100644 modules/buildsystem/templates/iurt/infra_2.conf diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index 4311856d..0a242ee1 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -25,6 +25,7 @@ class mga_buildsystem::config { 'nonfree' => $std_repos, 'tainted' => $std_repos, } + $std_base_media = [ 'core/release', 'core/updates' ] $infra_medias = { 'infra' => ['release'], } @@ -32,22 +33,27 @@ class mga_buildsystem::config { distros => { 'cauldron' => { 'medias' => $std_medias, + 'base_media' => $std_base_media, }, '1' => { 'medias' => $std_medias, + 'base_media' => $std_base_media, }, '2' => { 'medias' => $std_medias, + 'base_media' => $std_base_media, }, 'infra_1' => { 'medias' => $infra_medias, + 'base_media' => $std_base_media, }, 'infra_2' => { 'medias' => $infra_medias, + 'base_media' => $std_base_media, }, } } diff --git a/modules/buildsystem/manifests/iurt/config.pp b/modules/buildsystem/manifests/iurt/config.pp index 1d75c32e..1a86a9e4 100644 --- a/modules/buildsystem/manifests/iurt/config.pp +++ b/modules/buildsystem/manifests/iurt/config.pp @@ -7,6 +7,6 @@ define buildsystem::iurt::config() { file { "/etc/iurt/build/$distribution.conf": owner => $build_login, group => $build_login, - content => template("buildsystem/iurt/$distribution.conf") + content => template("buildsystem/iurt.conf") } } diff --git a/modules/buildsystem/manifests/var/distros.pp b/modules/buildsystem/manifests/var/distros.pp index 41c6df40..58f63417 100644 --- a/modules/buildsystem/manifests/var/distros.pp +++ b/modules/buildsystem/manifests/var/distros.pp @@ -3,6 +3,8 @@ # distribution name. Each distribution is itself an hash containing # the following keys: # - medias: an hash containing the different medias / repositories +# - base_media: a list of medias that will be used by iurt to build +# the chroots class buildsystem::var::distros( $distros ) { } diff --git a/modules/buildsystem/templates/iurt.conf b/modules/buildsystem/templates/iurt.conf new file mode 100644 index 00000000..0f29e525 --- /dev/null +++ b/modules/buildsystem/templates/iurt.conf @@ -0,0 +1,29 @@ +<%- distro = scope.lookupvar('buildsystem::var::distros::distros')[@distribution] -%> +{ + supported_arch => [ 'i586', 'x86_64' ], + all_media =>{ +<%- distro['medias'].each{|media, repos| -%> + '<%= media %>' => [ '<%= repos.join("', '") %>' ], +<%- +} -%> + }, + base_media => [ '<%= distro['base_media'].join("', '") %>' ], + upload => '<%= build_login %>@pkgsubmit:~/uploads/', + upload_queue => '<%= build_login %>@pkgsubmit:~/uploads/queue/', + unwanted_packages => '^monotone-', + repository => 'http://repository.<%= domain %>/distrib/', + log_url => 'http://pkgsubmit.<%= domain %>/queue/build/', + admin => 'mageia-sysadm@mageia.org', + packager => 'Iurt the rebuild bot ', + sendmail => 0, + build_timeout => { + 'default' => 18000, + 'gcc' => 57600, + 'paraview' => 115200, + 'salome' => 57600, + 'itk' => 115200, + 'wrapitk' => 115200, + 'libreoffice' => 345600 + }, +} + diff --git a/modules/buildsystem/templates/iurt/1.conf b/modules/buildsystem/templates/iurt/1.conf deleted file mode 100644 index fd346abd..00000000 --- a/modules/buildsystem/templates/iurt/1.conf +++ /dev/null @@ -1,23 +0,0 @@ -{ - supported_arch => [ 'i586', 'x86_64' ], - all_media => { 'core' => [ 'release' ], 'nonfree' => [ 'release' ], 'tainted' => [ 'release' ] }, - base_media => [ 'core/release', 'core/updates' ], - upload => '<%= build_login %>@pkgsubmit:~/uploads/', - upload_queue => '<%= build_login %>@pkgsubmit:~/uploads/queue/', - unwanted_packages => '^monotone-', - repository => 'http://repository.<%= domain %>/distrib/', - log_url => 'http://pkgsubmit.<%= domain %>/queue/build/', - admin => 'mageia-sysadm@mageia.org', - packager => 'Iurt the rebuild bot ', - sendmail => 0, - build_timeout => { - 'default' => 18000, - 'gcc' => 57600, - 'paraview' => 115200, - 'salome' => 57600, - 'itk' => 115200, - 'wrapitk' => 115200, - 'libreoffice' => 345600 - }, -} - diff --git a/modules/buildsystem/templates/iurt/2.conf b/modules/buildsystem/templates/iurt/2.conf deleted file mode 100644 index fd346abd..00000000 --- a/modules/buildsystem/templates/iurt/2.conf +++ /dev/null @@ -1,23 +0,0 @@ -{ - supported_arch => [ 'i586', 'x86_64' ], - all_media => { 'core' => [ 'release' ], 'nonfree' => [ 'release' ], 'tainted' => [ 'release' ] }, - base_media => [ 'core/release', 'core/updates' ], - upload => '<%= build_login %>@pkgsubmit:~/uploads/', - upload_queue => '<%= build_login %>@pkgsubmit:~/uploads/queue/', - unwanted_packages => '^monotone-', - repository => 'http://repository.<%= domain %>/distrib/', - log_url => 'http://pkgsubmit.<%= domain %>/queue/build/', - admin => 'mageia-sysadm@mageia.org', - packager => 'Iurt the rebuild bot ', - sendmail => 0, - build_timeout => { - 'default' => 18000, - 'gcc' => 57600, - 'paraview' => 115200, - 'salome' => 57600, - 'itk' => 115200, - 'wrapitk' => 115200, - 'libreoffice' => 345600 - }, -} - diff --git a/modules/buildsystem/templates/iurt/cauldron.conf b/modules/buildsystem/templates/iurt/cauldron.conf deleted file mode 100644 index a37f336c..00000000 --- a/modules/buildsystem/templates/iurt/cauldron.conf +++ /dev/null @@ -1,23 +0,0 @@ -{ - supported_arch => [ 'i586', 'x86_64' ], - all_media => { 'core' => [ 'release' ], 'nonfree' => [ 'release' ], 'tainted' => [ 'release' ] }, - base_media => [ 'core/release' ], - upload => '<%= build_login %>@pkgsubmit:~/uploads/', - upload_queue => '<%= build_login %>@pkgsubmit:~/uploads/queue/', - unwanted_packages => '^monotone-', - repository => 'http://repository.<%= domain %>/distrib/', - log_url => 'http://pkgsubmit.<%= domain %>/queue/build/', - admin => 'mageia-sysadm@mageia.org', - packager => 'Iurt the rebuild bot ', - sendmail => 0, - build_timeout => { - 'default' => 18000, - 'gcc' => 57600, - 'paraview' => 115200, - 'salome' => 57600, - 'itk' => 115200, - 'wrapitk' => 115200, - 'libreoffice' => 345600 - }, -} - diff --git a/modules/buildsystem/templates/iurt/infra_1.conf b/modules/buildsystem/templates/iurt/infra_1.conf deleted file mode 100644 index 045737de..00000000 --- a/modules/buildsystem/templates/iurt/infra_1.conf +++ /dev/null @@ -1,13 +0,0 @@ -{ - supported_arch => [ 'i586', 'x86_64' ], - all_media => { 'infra' => [ 'release' ] }, - base_media => [ 'base/core/release', 'base/core/updates' ], - upload => '<%= build_login %>@pkgsubmit:~/uploads/', - upload_queue => '<%= build_login %>@pkgsubmit:~/uploads/queue/', - repository => 'http://repository.<%= domain %>/distrib/', - log_url => 'http://pkgsubmit.<%= domain %>/queue/build/', - admin => 'mageia-sysadm@mageia.org', - packager => 'Iurt the rebuild bot ', - sendmail => 0, -} - diff --git a/modules/buildsystem/templates/iurt/infra_2.conf b/modules/buildsystem/templates/iurt/infra_2.conf deleted file mode 100644 index 045737de..00000000 --- a/modules/buildsystem/templates/iurt/infra_2.conf +++ /dev/null @@ -1,13 +0,0 @@ -{ - supported_arch => [ 'i586', 'x86_64' ], - all_media => { 'infra' => [ 'release' ] }, - base_media => [ 'base/core/release', 'base/core/updates' ], - upload => '<%= build_login %>@pkgsubmit:~/uploads/', - upload_queue => '<%= build_login %>@pkgsubmit:~/uploads/queue/', - repository => 'http://repository.<%= domain %>/distrib/', - log_url => 'http://pkgsubmit.<%= domain %>/queue/build/', - admin => 'mageia-sysadm@mageia.org', - packager => 'Iurt the rebuild bot ', - sendmail => 0, -} - -- cgit v1.2.1