Adds Fedora 13 and 14 pulp repos. They will appear in the create
template page as "Fedora Pulp <version> (x86_64)".
This patch requires you to have the puppet pulp sync configure patch
applied and deployed.
install and platform_id added to pulp repo configuration.
---
.../image_descriptor_package_repositories.yml | 21 ++++++++++++++++---
.../image_descriptor_platform_repositories.yml | 10 +++++++++
src/spec/fixtures/repositories.json | 18 ++++++++++++++++-
src/spec/utils/repository_manager_spec.rb | 8 ++++--
4 files changed, 49 insertions(+), 8 deletions(-)
diff --git a/src/config/image_descriptor_package_repositories.yml
b/src/config/image_descriptor_package_repositories.yml
index 6285ff1..1823bc4 100644
--- a/src/config/image_descriptor_package_repositories.yml
+++ b/src/config/image_descriptor_package_repositories.yml
@@ -29,7 +29,20 @@
# baseurl: url
# type: xml
#
-# -
-# baseurl:
https://admin:admin@localhost/pulp/api/
-# yumurl:
https://localhost/pulp/repos/
-# type: pulp
+-
+ id: f13-x86_64
+ name: Fedora 13
+ baseurl:
https://admin:admin@localhost/pulp/api/
+ yumurl:
https://localhost/pulp/repos/
+ type: pulp
+ install: true
+ platform_id: f13-x86_64
+
+-
+ id: f14-x86_64
+ name: Fedora 14
+ baseurl:
https://admin:admin@localhost/pulp/api/
+ yumurl:
https://localhost/pulp/repos/
+ type: pulp
+ install: true
+ platform_id: f14-x86_64
diff --git a/src/config/image_descriptor_platform_repositories.yml
b/src/config/image_descriptor_platform_repositories.yml
index b43c115..d9c3165 100644
--- a/src/config/image_descriptor_platform_repositories.yml
+++ b/src/config/image_descriptor_platform_repositories.yml
@@ -7,3 +7,13 @@ fedora14:
name: Fedora
version: 14
architecture: x86_64
+
+f13-x86_64:
+ name: Fedora Pulp
+ version: 13
+ architecture: x86_64
+
+f14-x86_64:
+ name: Fedora Pulp
+ version: 14
+ architecture: x86_64
\ No newline at end of file
diff --git a/src/spec/fixtures/repositories.json b/src/spec/fixtures/repositories.json
index 732cb77..8f7cfba 100644
--- a/src/spec/fixtures/repositories.json
+++ b/src/spec/fixtures/repositories.json
@@ -16,4 +16,20 @@
"sync_schedule" : null,
"uri_ref" : "/repositories/fedora/",
"use_symlinks" : false
- } ]
+ },
+ { "_id" : "f14-x86_64",
+ "arch" : "x86_64",
+ "errata" : "/repositories/fedora/errata/",
+ "id" : "f14-x86_64",
+ "name" : "fedora",
+ "packagegroupcategories" :
"/repositories/fedora/packagegroupcategories/",
+ "packagegroups" : "/repositories/fedora/packagegroups/",
+ "packages" : "/repositories/fedora/packages/",
+ "source" : { "supported_types" : [ "pulp" ],
+ "type" : "pulp",
+ "url" : "http://example/fedora"
+ },
+ "sync_schedule" : null,
+ "uri_ref" : "/repositories/fedora/",
+ "use_symlinks" : false
+ }]
diff --git a/src/spec/utils/repository_manager_spec.rb
b/src/spec/utils/repository_manager_spec.rb
index 7876254..e414679 100644
--- a/src/spec/utils/repository_manager_spec.rb
+++ b/src/spec/utils/repository_manager_spec.rb
@@ -31,8 +31,9 @@ describe RepositoryManager do
end
it 'should return a list of repositories' do
- @rmanager.repositories.should have(1).items
+ @rmanager.repositories.should have(2).items
@rmanager.repositories.first.id.should eql('fedora13')
+ @rmanager.repositories.second.id.should eql('f14-x86_64')
end
it 'should return a list of packagegroups' do
@@ -41,12 +42,13 @@ describe RepositoryManager do
end
it 'should return a list of categories' do
- @rmanager.categories.should have(1).items
+ @rmanager.categories.should have(2).items
@rmanager.categories.first[:id].should eql('base-system')
+ @rmanager.categories.second[:id].should eql('base-system')
end
it "should return a list of packages" do
- @rmanager.packages.should have(2).items
+ @rmanager.packages.should have(4).items
@rmanager.packages.first[:name].should eql('libdeltacloud')
end
end
--
1.7.4.4