From: Hunter Haugen Date: Fri, 21 Feb 2014 19:32:10 +0000 (-0800) Subject: Merge pull request #237 from hunner/change_port X-Git-Tag: 1.4.2~11 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d0b8ed8f64e413b4d33eaa6b9ce06dd197f1e9b1;hp=80ea5a72ca25d919874548349c93d8eaf8349e04;p=puppet-modules%2Fpuppetlabs-apt.git Merge pull request #237 from hunner/change_port Port 8080 is a bad choice and bumps into puppetdb --- diff --git a/Gemfile b/Gemfile index cd7fbc8..1e359d0 100644 --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,7 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' group :development, :test do gem 'rake', :require => false + gem 'pry', :require => false gem 'rspec-puppet', :require => false gem 'puppet-lint', :require => false gem 'puppetlabs_spec_helper', :require => false diff --git a/manifests/params.pp b/manifests/params.pp index 955954f..51a01be 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -21,11 +21,17 @@ class apt::params { } 'ubuntu': { case $::lsbdistcodename { - 'hardy','lucid','maverick','natty','oneiric','precise': { + 'hardy','maverick','natty','oneiric','precise': { $backports_location = 'http://us.archive.ubuntu.com/ubuntu' + $ppa_options = '-y' + } + 'lucid': { + $backports_location = 'http://us.archive.ubuntu.com/ubuntu' + $ppa_options = undef } default: { $backports_location = 'http://old-releases.ubuntu.com/ubuntu' + $ppa_options = '-y' } } } diff --git a/manifests/ppa.pp b/manifests/ppa.pp index caff436..7ec6b20 100644 --- a/manifests/ppa.pp +++ b/manifests/ppa.pp @@ -2,7 +2,7 @@ define apt::ppa( $release = $::lsbdistcodename, - $options = '-y' + $options = $apt::params::ppa_options, ) { $ensure = 'present' include apt::params diff --git a/spec/acceptance/apt_ppa_spec.rb b/spec/acceptance/apt_ppa_spec.rb index 2b156bc..60e6d4d 100644 --- a/spec/acceptance/apt_ppa_spec.rb +++ b/spec/acceptance/apt_ppa_spec.rb @@ -27,14 +27,13 @@ if fact('operatingsystem') == 'Ubuntu' end end - context 'readding a removed ppa.' do + context 'reading a removed ppa.' do it 'setup' do - shell('add-apt-repository -y ppa:raravena80/collectd5') # This leaves a blank file - shell('add-apt-repository --remove ppa:raravena80/collectd5') + shell('echo > /etc/apt/sources.list.d/raravena80-collectd5-$(lsb_release -c -s).list') end - it 'should readd it successfully' do + it 'should read it successfully' do pp = <<-EOS include '::apt' apt::ppa { 'ppa:raravena80/collectd5': } @@ -71,30 +70,31 @@ if fact('operatingsystem') == 'Ubuntu' end end - context 'options' do - context '-y' do - it 'works without failure' do - pp = <<-EOS - include '::apt' - apt::ppa { 'ppa:canonical-kernel-team/ppa': - release => precise, - options => '-y', - } - EOS - - shell('rm -rf /etc/apt/sources.list.d/canonical-kernel-team-ppa*', :acceptable_exit_codes => [0,1,2]) - apply_manifest(pp, :catch_failures => true) - end - - describe file('/etc/apt/sources.list.d/canonical-kernel-team-ppa-precise.list') do - it { should be_file } + if ! default[:platform].match(/10\.04/) + context 'options' do + context '-y' do + it 'works without failure' do + pp = <<-EOS + include '::apt' + apt::ppa { 'ppa:canonical-kernel-team/ppa': + release => precise, + options => '-y', + } + EOS + + shell('rm -rf /etc/apt/sources.list.d/canonical-kernel-team-ppa*', :acceptable_exit_codes => [0,1,2]) + apply_manifest(pp, :catch_failures => true) + end + + describe file('/etc/apt/sources.list.d/canonical-kernel-team-ppa-precise.list') do + it { should be_file } + end end end - end - context 'reset' do - it { shell('rm -rf /etc/apt/sources.list.d/canonical-kernel-team-ppa*', :acceptable_exit_codes => [0,1,2]) } + context 'reset' do + it { shell('rm -rf /etc/apt/sources.list.d/canonical-kernel-team-ppa*', :acceptable_exit_codes => [0,1,2]) } + end end - end end diff --git a/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml new file mode 100644 index 0000000..c1b8bdf --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml @@ -0,0 +1,11 @@ +HOSTS: + ubuntu-server-10044-x64: + roles: + - master + platform: ubuntu-10.04-amd64 + box : ubuntu-server-10044-x64-vbox4210-nocm + box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box + hypervisor : vagrant +CONFIG: + log_level: debug + type: git diff --git a/spec/defines/ppa_spec.rb b/spec/defines/ppa_spec.rb index dc1173b..6a571a8 100644 --- a/spec/defines/ppa_spec.rb +++ b/spec/defines/ppa_spec.rb @@ -1,20 +1,28 @@ require 'spec_helper' describe 'apt::ppa', :type => :define do - [ { :lsbdistrelease => '11.04', + [ + { + :lsbdistrelease => '11.04', :lsbdistcodename => 'natty', :operatingsystem => 'Ubuntu', - :package => 'python-software-properties'}, - { :lsbdistrelease => '12.10', + :lsbdistid => 'Ubuntu', + :package => 'python-software-properties' + }, + { + :lsbdistrelease => '12.10', :lsbdistcodename => 'quantal', :operatingsystem => 'Ubuntu', - :package => 'software-properties-common'}, + :lsbdistid => 'Ubuntu', + :package => 'software-properties-common' + }, ].each do |platform| context "on #{platform[:lsbdistcodename]}" do let :facts do { - :lsbdistrelease => platform[:lsbdistrelease], + :lsbdistrelease => platform[:lsbdistrelease], :lsbdistcodename => platform[:lsbdistcodename], :operatingsystem => platform[:operatingsystem], + :lsbdistid => platform[:lsbdistid], } end let :release do diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index a4fc1bd..37afbfc 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -1,12 +1,19 @@ require 'beaker-rspec' -hosts.each do |host| - # Install Puppet - install_package host, 'rubygems' - on host, 'gem install puppet --no-ri --no-rdoc' - on host, "mkdir -p #{host['distmoduledir']}" +# Install Puppet +unless ENV['RS_PROVISION'] == 'no' + hosts.each do |host| + if host.is_pe? + install_pe + else + install_puppet + on host, "mkdir -p #{host['distmoduledir']}" + end + end end +UNSUPPORTED_PLATFORMS = ['windows','aix','solaris',/el-(4|5|6)/] + RSpec.configure do |c| # Project root proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))