diff options
-rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 4 | ||||
-rw-r--r-- | modules/buildsystem/manifests/var/scheduler.pp | 5 | ||||
-rw-r--r-- | modules/buildsystem/templates/upload.conf | 12 |
3 files changed, 18 insertions, 3 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index ade1cb92..cc586de8 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -10,6 +10,10 @@ class mga_buildsystem::config { class { 'buildsystem::var::scheduler' : admin_mail => 'mageia-sysadm@mageia.org', + build_nodes => { + 'i586' => [ 'jonund0', 'ecosse0', 'jonund1', 'ecosse1' ], + 'x86_64' => [ 'ecosse0', 'jonund0', 'ecosse1', 'jonund1' ], + }, } include buildsystem::var::repository class { 'buildsystem::var::youri': diff --git a/modules/buildsystem/manifests/var/scheduler.pp b/modules/buildsystem/manifests/var/scheduler.pp index a6b9ef4f..d69c66fc 100644 --- a/modules/buildsystem/manifests/var/scheduler.pp +++ b/modules/buildsystem/manifests/var/scheduler.pp @@ -1,8 +1,11 @@ # $admin_mail: # the email address from which the build failure notifications # will be sent +# $build_nodes: +# a hash containing available build nodes indexed by architecture class buildsystem::var::scheduler( - $admin_mail = "root@${::domain}" + $admin_mail = "root@${::domain}", + $build_nodes ){ $login = 'schedbot' $homedir = "/var/lib/$login" diff --git a/modules/buildsystem/templates/upload.conf b/modules/buildsystem/templates/upload.conf index c3471219..2d39bb76 100644 --- a/modules/buildsystem/templates/upload.conf +++ b/modules/buildsystem/templates/upload.conf @@ -7,9 +7,17 @@ # ### +<%- + build_nodes = scope.lookupvar('buildsystem::var::scheduler::build_nodes') +-%> my %nodes = ( - i586 => [ qw(jonund0 ecosse0 jonund1 ecosse1) ], - x86_64 => [ qw(ecosse0 jonund0 ecosse1 jonund1) ], +<%- + build_nodes.keys.sort.each{|arch| +-%> + <%= arch -%> => [ '<%= build_nodes[arch].join("', '") -%>' ], +<%- + } +-%> ); my $repository = "http://<%= scope.lookupvar('buildsystem::var::repository::hostname') %>/<%= scope.lookupvar('buildsystem::var::repository::distribdir') %>/"; my $homedir = "<%= scope.lookupvar('buildsystem::var::iurt::homedir') %>"; |