aboutsummaryrefslogtreecommitdiffstats
path: root/modules/buildsystem
diff options
context:
space:
mode:
authorOlivier Blin <blino@mageia.org>2010-11-24 00:25:19 +0000
committerOlivier Blin <blino@mageia.org>2010-11-24 00:25:19 +0000
commitb19d58417228be03c7a8adb786e427e4f300eafe (patch)
treeab4724bd0effb27f51aa3100218457b354a4b09b /modules/buildsystem
parent0d051987cc835ce28e0a04f9ea3a4b4014d630d4 (diff)
downloadpuppet-b19d58417228be03c7a8adb786e427e4f300eafe.tar
puppet-b19d58417228be03c7a8adb786e427e4f300eafe.tar.gz
puppet-b19d58417228be03c7a8adb786e427e4f300eafe.tar.bz2
puppet-b19d58417228be03c7a8adb786e427e4f300eafe.tar.xz
puppet-b19d58417228be03c7a8adb786e427e4f300eafe.zip
extract repository variable
Diffstat (limited to 'modules/buildsystem')
-rw-r--r--modules/buildsystem/templates/upload.conf3
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/buildsystem/templates/upload.conf b/modules/buildsystem/templates/upload.conf
index 61cdd5e1..d30927be 100644
--- a/modules/buildsystem/templates/upload.conf
+++ b/modules/buildsystem/templates/upload.conf
@@ -11,6 +11,7 @@ my %nodes = (
i586 => [ qw(ecosse) ],
x86_64 => [ qw(jonund) ],
);
+my $repository = "http://repository/distrib/";
{
bot => {
@@ -24,7 +25,7 @@ my %nodes = (
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__',
+ command => "iurt --iurtlogdir __IURTLOGDIR__ --copy_srpm --group -v 6 --config local_spool /home/iurt/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- $repository -p \"__PACKAGER__\" -r __TARGET__ __ARCH__",
packages => '/home/iurt/iurt/',
log => '/home/iurt/iurt/',
},