aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--deployment/mga_buildsystem/manifests/config.pp7
-rw-r--r--modules/buildsystem/manifests/var/iurt.pp3
-rw-r--r--modules/buildsystem/templates/iurt.conf2
3 files changed, 10 insertions, 2 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp
index d53c93ac..5f8fbdcb 100644
--- a/deployment/mga_buildsystem/manifests/config.pp
+++ b/deployment/mga_buildsystem/manifests/config.pp
@@ -15,6 +15,13 @@ class mga_buildsystem::config {
theme_name => 'mageia',
}
+ class { 'buildsystem::var::iurt':
+ timeout_multiplier => $::architecture ? {
+ /arm/ => 2,
+ default => 1,
+ }
+ }
+
class { 'buildsystem::var::scheduler' :
admin_mail => "sysadmin@group.${::domain}",
build_nodes => {
diff --git a/modules/buildsystem/manifests/var/iurt.pp b/modules/buildsystem/manifests/var/iurt.pp
index 3f91c676..fb65a160 100644
--- a/modules/buildsystem/manifests/var/iurt.pp
+++ b/modules/buildsystem/manifests/var/iurt.pp
@@ -1,4 +1,5 @@
class buildsystem::var::iurt(
$login = 'iurt',
- $homedir = '/home/iurt'
+ $homedir = '/home/iurt',
+ $timeout_multiplier = 1,
) { }
diff --git a/modules/buildsystem/templates/iurt.conf b/modules/buildsystem/templates/iurt.conf
index 84baac52..1cbe1074 100644
--- a/modules/buildsystem/templates/iurt.conf
+++ b/modules/buildsystem/templates/iurt.conf
@@ -21,7 +21,7 @@
sendmail => 0,
build_timeout => {
<%- build_timeout.keys.sort.each{|package| -%>
- '<%= package %>' => <%= build_timeout[package] %>,
+ '<%= package %>' => <%= (build_timeout[package].to_f * scope.lookupvar('buildsystem::var::iurt::timeout_multiplier').to_f).to_i %>,
<%-
} -%>
},