From 7392d7953c3dd1c91d3e65f0b4921e5bcd759e59 Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Thu, 16 Feb 2012 23:42:58 +0000 Subject: Rename infra_1 media and make it depend from the base media --- modules/buildsystem/manifests/create_upload_dir.rb | 2 +- modules/buildsystem/templates/iurt/infra_1.conf | 4 ++-- modules/buildsystem/templates/upload.conf | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'modules/buildsystem') diff --git a/modules/buildsystem/manifests/create_upload_dir.rb b/modules/buildsystem/manifests/create_upload_dir.rb index 7821ab0b..232c849f 100644 --- a/modules/buildsystem/manifests/create_upload_dir.rb +++ b/modules/buildsystem/manifests/create_upload_dir.rb @@ -27,7 +27,7 @@ define "create_upload_dir", :owner, :group do end rel = 'infra_1' - rep = 'core' + rep = 'infra' med = 'release' file [@name, st, rel].join('/'), :ensure => 'directory', :owner => @owner, :group => @group file [@name, st, rel, rep].join('/'), :ensure => 'directory', :owner => @owner, :group => @group 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" ], -- cgit v1.2.1