aboutsummaryrefslogtreecommitdiffstats
path: root/modules/buildsystem/templates
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2012-02-16 23:42:58 +0000
committerPascal Terjan <pterjan@mageia.org>2012-02-16 23:42:58 +0000
commit7392d7953c3dd1c91d3e65f0b4921e5bcd759e59 (patch)
treeeb0267b052b20a3438d3ec147b56e9ad32c371ca /modules/buildsystem/templates
parent6a46dcaedd57ad670cff8c086a206bbbe13bfaae (diff)
downloadpuppet-7392d7953c3dd1c91d3e65f0b4921e5bcd759e59.tar
puppet-7392d7953c3dd1c91d3e65f0b4921e5bcd759e59.tar.gz
puppet-7392d7953c3dd1c91d3e65f0b4921e5bcd759e59.tar.bz2
puppet-7392d7953c3dd1c91d3e65f0b4921e5bcd759e59.tar.xz
puppet-7392d7953c3dd1c91d3e65f0b4921e5bcd759e59.zip
Rename infra_1 media and make it depend from the base media
Diffstat (limited to 'modules/buildsystem/templates')
-rw-r--r--modules/buildsystem/templates/iurt/infra_1.conf4
-rw-r--r--modules/buildsystem/templates/upload.conf1
2 files changed, 3 insertions, 2 deletions
diff --git a/modules/buildsystem/templates/iurt/infra_1.conf b/modules/buildsystem/templates/iurt/infra_1.conf
index 7c76d253..5f41e9f2 100644
--- a/modules/buildsystem/templates/iurt/infra_1.conf
+++ b/modules/buildsystem/templates/iurt/infra_1.conf
@@ -1,7 +1,7 @@
{
supported_arch => [ 'i586', 'x86_64' ],
- all_media => { 'core' => [ 'release' ] },
- base_media => [ '1/core/release' ],
+ all_media => { 'infra' => [ 'release' ] },
+ base_media => [ 'base/core/release' ],
upload => '<%= build_login %>@pkgsubmit:~/uploads/',
upload_queue => '<%= build_login %>@pkgsubmit:~/uploads/queue/',
repository => 'http://repository.<%= domain %>/distrib/',
diff --git a/modules/buildsystem/templates/upload.conf b/modules/buildsystem/templates/upload.conf
index afec4200..f4555259 100644
--- a/modules/buildsystem/templates/upload.conf
+++ b/modules/buildsystem/templates/upload.conf
@@ -36,6 +36,7 @@ my $homedir = "<%= build_home_dir %>";
},
media => {
default => {
+ "infra/release" => [ "infra/release", "base/core/updates", "base/core/release" ],
"core/release" => [ "core/updates", "core/release" ],
"core/updates" => [ "core/updates", "core/release" ],
"core/updates_testing" => [ "core/updates_testing", "core/updates", "core/release" ],