diff options
| author | Olivier Blin <blino@mageia.org> | 2010-11-23 22:57:04 +0000 |
|---|---|---|
| committer | Olivier Blin <blino@mageia.org> | 2010-11-23 22:57:04 +0000 |
| commit | 84edab7bd61703c16279463f9c5bb02bb86fc588 (patch) | |
| tree | d95fb0606dcba43f3955b0d9f28b8b2db751bef0 /modules/buildsystem | |
| parent | 7b9c5195c61a61e6237458be52931ee7e5abb0ce (diff) | |
| download | puppet-84edab7bd61703c16279463f9c5bb02bb86fc588.tar puppet-84edab7bd61703c16279463f9c5bb02bb86fc588.tar.gz puppet-84edab7bd61703c16279463f9c5bb02bb86fc588.tar.bz2 puppet-84edab7bd61703c16279463f9c5bb02bb86fc588.tar.xz puppet-84edab7bd61703c16279463f9c5bb02bb86fc588.zip | |
simplify nodes declaration
Diffstat (limited to 'modules/buildsystem')
| -rw-r--r-- | modules/buildsystem/templates/upload.conf | 48 |
1 files changed, 22 insertions, 26 deletions
diff --git a/modules/buildsystem/templates/upload.conf b/modules/buildsystem/templates/upload.conf index 4e4c15e7..61cdd5e1 100644 --- a/modules/buildsystem/templates/upload.conf +++ b/modules/buildsystem/templates/upload.conf @@ -7,35 +7,31 @@ # ### +my %nodes = ( + i586 => [ qw(ecosse) ], + x86_64 => [ qw(jonund) ], +); + { - bot => { - i586 => { - map { - ($_ => { - iurt => { - user => 'iurt', + bot => { + (map { + my $arch = $_; + $arch => { + map { + my $node = $_; + ($node => { + iurt => { + user => 'iurt', # (spuk, 2007-08-16) disabled iurt_cache additional media, locks trying to mount -o bind # command => 'iurt --iurtlogdir __IURTLOGDIR__ --copy-srpm --group -v 6 --config local_spool /home/iurt/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- http://repository/distrib/ --additional-media -m __MEDIA__ -- file:///home/iurt_cache/ -p \"__PACKAGER__\" -r __TARGET__ __ARCH__', - command => 'iurt --iurtlogdir __IURTLOGDIR__ --copy_srpm --group -v 6 --config local_spool /home/iurt/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- http://repository/distrib/ -p \"__PACKAGER__\" -r __TARGET__ __ARCH__', - packages => '/home/iurt/iurt/', - log => '/home/iurt/iurt/', - }, - }); - } qw(ecosse), - }, - - x86_64 => { - map { - ($_ => { - iurt => { - user => 'iurt', - command => 'iurt --iurtlogdir __IURTLOGDIR__ --copy_srpm --group -v 6 --config local_spool /home/iurt/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- http://repository/distrib/ -p \"__PACKAGER__\" -r __TARGET__ __ARCH__', - packages => '/home/iurt/iurt/', - log => '/home/iurt/iurt/', - }, - }); - } qw(jonund), - }, + command => 'iurt --iurtlogdir __IURTLOGDIR__ --copy_srpm --group -v 6 --config local_spool /home/iurt/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- http://repository/distrib/ -p \"__PACKAGER__\" -r __TARGET__ __ARCH__', + packages => '/home/iurt/iurt/', + log => '/home/iurt/iurt/', + }, + }); + } @{$nodes{$arch}}, + }; + } keys %nodes), }, media => { default => { |