diff options
author | Nicolas Vigier <boklm@mageia.org> | 2013-05-23 15:05:11 +0000 |
---|---|---|
committer | Nicolas Vigier <boklm@mageia.org> | 2013-05-23 15:05:11 +0000 |
commit | 941f7e3d093e802483ef615b4fa70a03bfc2bb30 (patch) | |
tree | 5a08a2664d123c2dda2a03035dbf13aff9c869dd /modules/buildsystem/templates/iurt/1.conf | |
parent | 6622804070b891d186433ac35e8bdc86b57ae58d (diff) | |
download | puppet-941f7e3d093e802483ef615b4fa70a03bfc2bb30.tar puppet-941f7e3d093e802483ef615b4fa70a03bfc2bb30.tar.gz puppet-941f7e3d093e802483ef615b4fa70a03bfc2bb30.tar.bz2 puppet-941f7e3d093e802483ef615b4fa70a03bfc2bb30.tar.xz puppet-941f7e3d093e802483ef615b4fa70a03bfc2bb30.zip |
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.
Diffstat (limited to 'modules/buildsystem/templates/iurt/1.conf')
-rw-r--r-- | modules/buildsystem/templates/iurt/1.conf | 23 |
1 files changed, 0 insertions, 23 deletions
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 <mageia-sysadm@mageia.org>', - sendmail => 0, - build_timeout => { - 'default' => 18000, - 'gcc' => 57600, - 'paraview' => 115200, - 'salome' => 57600, - 'itk' => 115200, - 'wrapitk' => 115200, - 'libreoffice' => 345600 - }, -} - |