aboutsummaryrefslogtreecommitdiffstats
path: root/modules/buildsystem/templates/upload.conf
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-03-16 22:46:23 +0000
committerMichael Scherer <misc@mageia.org>2012-03-16 22:46:23 +0000
commitb74151bf723df3fcadf24d2f6e00401bb69c1020 (patch)
treeca67dcadb418e482472167cca393fb4ac5a1b5b3 /modules/buildsystem/templates/upload.conf
parent31adbee69aa33150bd8016837b85646a948f8ad7 (diff)
downloadpuppet-b74151bf723df3fcadf24d2f6e00401bb69c1020.tar
puppet-b74151bf723df3fcadf24d2f6e00401bb69c1020.tar.gz
puppet-b74151bf723df3fcadf24d2f6e00401bb69c1020.tar.bz2
puppet-b74151bf723df3fcadf24d2f6e00401bb69c1020.tar.xz
puppet-b74151bf723df3fcadf24d2f6e00401bb69c1020.zip
refactor completely iurt module ( maybe should even be moved out of buildsystem
module, since it tend to be too big )
Diffstat (limited to 'modules/buildsystem/templates/upload.conf')
-rw-r--r--modules/buildsystem/templates/upload.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/buildsystem/templates/upload.conf b/modules/buildsystem/templates/upload.conf
index f4555259..99443831 100644
--- a/modules/buildsystem/templates/upload.conf
+++ b/modules/buildsystem/templates/upload.conf
@@ -12,7 +12,7 @@ my %nodes = (
x86_64 => [ qw(jonund0 ecosse0 jonund1 ecosse1) ],
);
my $repository = "http://repository.<%= domain %>/distrib/";
-my $homedir = "<%= build_home_dir %>";
+my $homedir = "<%= homedir %>";
{
bot => {
@@ -23,7 +23,7 @@ my $homedir = "<%= build_home_dir %>";
my $node = $_;
($node => {
iurt => {
- user => '<%= build_login %>',
+ user => '<%= login %>',
# (spuk, 2007-08-16) disabled iurt_cache additional media, locks trying to mount -o bind
# command => "iurt --copy-srpm --group -v 6 --config local_spool $homedir/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- $repository --additional-media -m __MEDIA__ -- file://$homedir/cache/ -p \"__PACKAGER__\" -r __TARGET__ __ARCH__",
command => "iurt --copy_srpm --group --rpmmacros \"%distro_section __SECTION__\" --config local_spool $homedir/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- $repository -p \"__PACKAGER__\" -r __TARGET__ __ARCH__",