From d0430fa7a7a032d92ed00634f321ca0f0322bf8d Mon Sep 17 00:00:00 2001
From: Nicolas Vigier <boklm@mageia.org>
Date: Thu, 23 May 2013 15:06:43 +0000
Subject: buildsystem: Change youri submit configuration

The youri submit configuration has been changed. The following two
template files :
 - youri/submit-todo.conf
 - youri/submit-upload.conf
have been replaced by a common template file for youri submit-todo and
youri submit-upload :
 - youri/submit.conf

This new template file does not contain any specific configuration.
Instead the youri configuration is now created using informations from
the following hash variables :
 - the $youri_conf_default hash from buildsystem::var::youri, containing
   default configuration for the repository, the checks, actions and
   posts.
 - the $youri_conf parameter from buildsystem::var::youri, overriding
   infos from the default configuration defined in $youri_conf_default.
 - the distros specific configuration is defined in the $distros
   parameter from buildsystem::var::distros.
All those variables contain configuration for both youri submit-todo
and youri submit-upload.

This change allows moving all Mageia specific configuration outside the
buildsystem module to the class mga_buildsystem::config, while still
keeping common configuration in the buildsystem module.

The following checks definitions have also been removed from youri
submit-todo configuration, because they are not used in the current
configuration :
 - history
 - precedence
 - section
 - svn

The 'version' check options for infra_1 and infra_2 have been moved from
youri submit-upload to submit-todo configuration.
---
 modules/buildsystem/manifests/var/scheduler.pp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'modules/buildsystem/manifests/var/scheduler.pp')

diff --git a/modules/buildsystem/manifests/var/scheduler.pp b/modules/buildsystem/manifests/var/scheduler.pp
index d69c66fc..087020bf 100644
--- a/modules/buildsystem/manifests/var/scheduler.pp
+++ b/modules/buildsystem/manifests/var/scheduler.pp
@@ -1,10 +1,13 @@
 # $admin_mail:
 #   the email address from which the build failure notifications
 #   will be sent
+# $pkg_uphost:
+#   hostname of the server where submitted packages are uploaded
 # $build_nodes:
 #   a hash containing available build nodes indexed by architecture
 class buildsystem::var::scheduler(
     $admin_mail = "root@${::domain}",
+    $pkg_uphost = "pkgsubmit.${::domain}",
     $build_nodes
 ){
     $login = 'schedbot'
-- 
cgit v1.2.1