aboutsummaryrefslogtreecommitdiffstats
path: root/modules/buildsystem
diff options
context:
space:
mode:
authorOlivier Blin <dev@blino.org>2015-11-29 02:39:52 +0100
committerOlivier Blin <dev@blino.org>2015-11-30 01:20:13 +0100
commitaac4d25326e09a560e0d2190e1ebdec39992a21a (patch)
tree676091fd7d380c6f2d5648f57e6e34006c7d8a1d /modules/buildsystem
parenta91b8426af2ed3b36f2559dfd4dda016f0459074 (diff)
downloadpuppet-aac4d25326e09a560e0d2190e1ebdec39992a21a.tar
puppet-aac4d25326e09a560e0d2190e1ebdec39992a21a.tar.gz
puppet-aac4d25326e09a560e0d2190e1ebdec39992a21a.tar.bz2
puppet-aac4d25326e09a560e0d2190e1ebdec39992a21a.tar.xz
puppet-aac4d25326e09a560e0d2190e1ebdec39992a21a.zip
iurt: Move build timeout config to puppet file
Diffstat (limited to 'modules/buildsystem')
-rw-r--r--modules/buildsystem/manifests/iurt/config.pp10
-rw-r--r--modules/buildsystem/templates/iurt.conf11
2 files changed, 14 insertions, 7 deletions
diff --git a/modules/buildsystem/manifests/iurt/config.pp b/modules/buildsystem/manifests/iurt/config.pp
index 4c1dc055..3db0951b 100644
--- a/modules/buildsystem/manifests/iurt/config.pp
+++ b/modules/buildsystem/manifests/iurt/config.pp
@@ -6,6 +6,16 @@ define buildsystem::iurt::config() {
# TODO rename the variable too in template
$build_login = $buildsystem::var::iurt::login
+ $build_timeout = {
+ 'default' => 18000,
+ 'gcc' => 57600,
+ 'paraview' => 115200,
+ 'salome' => 57600,
+ 'itk' => 115200,
+ 'wrapitk' => 115200,
+ 'libreoffice' => 345600
+ }
+
file { "/etc/iurt/build/${distribution}.conf":
owner => $build_login,
group => $build_login,
diff --git a/modules/buildsystem/templates/iurt.conf b/modules/buildsystem/templates/iurt.conf
index 34809afa..84baac52 100644
--- a/modules/buildsystem/templates/iurt.conf
+++ b/modules/buildsystem/templates/iurt.conf
@@ -20,13 +20,10 @@
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
+<%- build_timeout.keys.sort.each{|package| -%>
+ '<%= package %>' => <%= build_timeout[package] %>,
+<%-
+} -%>
},
}