diff --git a/Gemfile b/Gemfile index a39114ce3..933d9bb45 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ group :test do gem 'voxpupuli-test', '~> 2.5', :require => false gem 'coveralls', :require => false gem 'simplecov-console', :require => false - gem 'puppet_metadata', '~> 1.0', :require => false + gem 'puppet_metadata', :require => false, :git => 'https://github.com/bastelfreak/puppet_metadata.git', :branch => 'add-archlinux' end group :development do @@ -16,6 +16,9 @@ group :development do end group :system_tests do + gem 'beaker-hostgenerator', :require => false, :git => 'https://github.com/ekohl/beaker-hostgenerator.git', :branch => 'add-archlinux' + gem 'beaker', :require => false, :git => 'https://github.com/bastelfreak/beaker.git', :branch => 'add-archlinux' + gem 'beaker-docker', :require => false, :git => 'https://github.com/bastelfreak/beaker-docker.git', :branch => 'add-archlinux' gem 'voxpupuli-acceptance', '~> 1.0', :require => false end diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb index 353c766ce..9f5ade146 100644 --- a/spec/acceptance/class_spec.rb +++ b/spec/acceptance/class_spec.rb @@ -22,6 +22,8 @@ else %r{Phusion} end + when 'Archlinux' + pkg_remove_cmd = 'pacman --remove --noconfirm --nosave --recursive nginx-mainline' end context 'default parameters' do @@ -42,7 +44,7 @@ end end - context 'nginx with package_source passenger' do + context 'nginx with package_source passenger', unless: default[:platform] =~ %r{archlinux} do it 'runs successfully' do shell(pkg_remove_cmd) pp = <<-EOS