Permalink
Browse files

Remove extras packages from rpmbuilder

These packages don't have anything to do with building rpms or mocking, so this
commit removes them from the module. It removes the tests and removes their
inclusion from the main entry class.
  • Loading branch information...
1 parent f2c371f commit 3f73f0144585bd740f07248d24da9baaa83c2321 @haus haus committed Nov 15, 2012
Showing with 0 additions and 34 deletions.
  1. +0 −1 manifests/init.pp
  2. +0 −14 manifests/packages/extra.pp
  3. +0 −18 spec/classes/packages_extra_spec.rb
  4. +0 −1 spec/classes/rpmbuilder_spec.rb
View
@@ -23,7 +23,6 @@
}
if $pe {
- include rpmbuilder::packages::extra
class { rpmbuilder::mock::pe_mocks:
pe_vers => $pe_vers,
mock_root => $mock_root,
@@ -1,14 +0,0 @@
-class rpmbuilder::packages::extra {
-
- $builder_pkgs = [
- 'mlocate',
- 'nfs-utils',
- 's3cmd',
- 'rubygem-pg'
- ]
-
- package { $builder_pkgs:
- ensure => installed,
- require => Class['epel'],
- }
-}
@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-describe 'rpmbuilder::packages::extra', :type => 'class' do
-
- context "Packages which should be installed" do
-
- packages = [
- 'mlocate',
- 'nfs-utils',
- 's3cmd',
- 'rubygem-pg',
- ]
-
- packages.each do|pkg|
- it { should contain_package(pkg).with_ensure('installed').with_require('Class[Rpmbuilder::Repos]') }
- end
- end
-end
@@ -55,7 +55,6 @@
it do
if param_hash[:pe]
- should contain_Rpmbuilder__Packages__Extra
should contain_Rpmbuilder__Mock__Pe_mocks.with({
:pe_vers => param_hash[:pe_vers],
:mock_root => param_hash[:mock_root],

0 comments on commit 3f73f01

Please sign in to comment.