aboutsummaryrefslogtreecommitdiffstats
path: root/deployment/mga_buildsystem
diff options
context:
space:
mode:
authorNicolas Lécureuil <neoclust@mageia.org>2016-09-18 13:40:32 +0200
committerNicolas Lécureuil <neoclust@mageia.org>2016-09-18 13:40:32 +0200
commit1b9243456fdcb3b4c85d6fdda7638dd833a559f9 (patch)
tree334f3331a37a3bfb9772185c5fa1828ce96a17e8 /deployment/mga_buildsystem
parent7ad41f4fa0b68579c90c60b21e955af63ead1a74 (diff)
downloadpuppet-1b9243456fdcb3b4c85d6fdda7638dd833a559f9.tar
puppet-1b9243456fdcb3b4c85d6fdda7638dd833a559f9.tar.gz
puppet-1b9243456fdcb3b4c85d6fdda7638dd833a559f9.tar.bz2
puppet-1b9243456fdcb3b4c85d6fdda7638dd833a559f9.tar.xz
puppet-1b9243456fdcb3b4c85d6fdda7638dd833a559f9.zip
Remove rabbit from build nodes
Allow to push perl_checker during freeze
Diffstat (limited to 'deployment/mga_buildsystem')
-rw-r--r--deployment/mga_buildsystem/manifests/config.pp6
1 files changed, 3 insertions, 3 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp
index 36ac449d..caf665c0 100644
--- a/deployment/mga_buildsystem/manifests/config.pp
+++ b/deployment/mga_buildsystem/manifests/config.pp
@@ -25,8 +25,8 @@ class mga_buildsystem::config {
class { 'buildsystem::var::scheduler' :
admin_mail => "sysadmin@group.${::domain}",
build_nodes => {
- 'i586' => [ 'ecosse0', 'rabbit0', 'rabbit1', 'ecosse1' ],
- 'x86_64' => [ 'rabbit0', 'ecosse0', 'rabbit1', 'ecosse1' ],
+ 'i586' => [ 'ecosse0', 'ecosse1' ],
+ 'x86_64' => [ 'ecosse0', 'ecosse1' ],
'armv5tl' => [ 'armorique', 'armagnac', 'armada', 'armlet1', 'armlet2', 'armlet3', 'armlet4', 'armlet5' ],
'armv7hl' => [ 'armorique', 'armagnac', 'armada', 'armlet1', 'armlet2', 'armlet3', 'armlet4', 'armlet5' ],
},
@@ -501,7 +501,7 @@ class mga_buildsystem::config {
$cauldron_version_check = {
'authorized_sections' => '^[a-z]+/updates_testing$',
#'authorized_packages' => 'none_package_authorized',
- 'authorized_packages' => 'drak|^(urpmi|perl-URPM|perl-(MDK-Common|Gtk3|Glib(-Object-Introspection)?)|mgaonline|net_monitor|mandi|indexhtml|ldetect(-lst)?|msec|manatools|rpm-(mageia-setup|helper)|(mga-|mageia).*)$',
+ 'authorized_packages' => 'drak|^(urpmi|perl-URPM|perl-(MDK-Common|Gtk3|Glib(-Object-Introspection)?)|mgaonline|net_monitor|perl_checker|mandi|indexhtml|ldetect(-lst)?|msec|manatools|rpm-(mageia-setup|helper)|(mga-|mageia).*)$',
'authorized_arches' => 'none',
'authorized_users' => "^${cauldron_authorized_users}\$",
#'mode' => 'normal',