Skip to content

Commit 28d637c

Browse files
committed
Use voxpupuli-acceptance
1 parent e0d1dc4 commit 28d637c

File tree

4 files changed

+9
-43
lines changed

4 files changed

+9
-43
lines changed

.sync.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@
44
- set: centos7-64
55
- set: debian9-64
66
secure: "l2HEhssQyDQGrdBkGS8f/gQ4FA5vVLM0JegyAVaaIXpRrJYgRiDAvC+u81HS//+J0v9cr4jo74ncl1HGU0QJZURJX/L8DJqUVXzSZpe9HmfrQpV1RDUSNMqzaIq5Z268Ou9n1Jkeg58WJyIaks9PQhXoWRRSnaCyDHrbGM8XcAU="
7+
spec/spec_helper_acceptance.rb:
8+
unmanaged: false

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@ matrix:
2424
env: PUPPET_VERSION="~> 5.0" CHECK=build DEPLOY_TO_FORGE=yes
2525
- rvm: 2.5.3
2626
bundler_args: --without development release
27-
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos7-64 BEAKER_HYPERVISOR=docker CHECK=beaker
27+
env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=centos7-64 CHECK=beaker
2828
services: docker
2929
- rvm: 2.5.3
3030
bundler_args: --without development release
31-
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=centos7-64 BEAKER_HYPERVISOR=docker CHECK=beaker
31+
env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=centos7-64 CHECK=beaker
3232
services: docker
3333
- rvm: 2.5.3
3434
bundler_args: --without development release
35-
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian9-64 BEAKER_HYPERVISOR=docker CHECK=beaker
35+
env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=debian9-64 CHECK=beaker
3636
services: docker
3737
- rvm: 2.5.3
3838
bundler_args: --without development release
39-
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian9-64 BEAKER_HYPERVISOR=docker CHECK=beaker
39+
env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=debian9-64 CHECK=beaker
4040
services: docker
4141
branches:
4242
only:

Gemfile

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,7 @@ group :development do
2424
end
2525

2626
group :system_tests do
27-
gem 'winrm', :require => false
28-
if beaker_version = ENV['BEAKER_VERSION']
29-
gem 'beaker', *location_for(beaker_version)
30-
else
31-
gem 'beaker', '>= 4.2.0', :require => false
32-
end
33-
if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
34-
gem 'beaker-rspec', *location_for(beaker_rspec_version)
35-
else
36-
gem 'beaker-rspec', :require => false
37-
end
38-
gem 'serverspec', :require => false
39-
gem 'beaker-hostgenerator', '>= 1.1.22', :require => false
40-
gem 'beaker-docker', :require => false
41-
gem 'beaker-puppet', :require => false
42-
gem 'beaker-puppet_install_helper', :require => false
43-
gem 'beaker-module_install_helper', :require => false
44-
gem 'rbnacl', '>= 4', :require => false
45-
gem 'rbnacl-libsodium', :require => false
46-
gem 'bcrypt_pbkdf', :require => false
47-
gem 'ed25519', :require => false
27+
gem 'voxpupuli-acceptance', :require => false
4828
end
4929

5030
group :release do

spec/spec_helper_acceptance.rb

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
require 'beaker-rspec'
2-
require 'beaker-puppet'
3-
require 'beaker/puppet_install_helper'
4-
require 'beaker/module_install_helper'
1+
require 'voxpupuli/acceptance/spec_helper_acceptance'
52

6-
run_puppet_install_helper unless ENV['BEAKER_provision'] == 'no'
7-
install_ca_certs unless ENV['PUPPET_INSTALL_TYPE'] =~ %r{pe}i
8-
install_module_on(hosts)
9-
install_module_dependencies_on(hosts)
10-
11-
RSpec.configure do |c|
12-
# Readable test descriptions
13-
c.formatter = :documentation
14-
hosts.each do |host|
15-
if host[:platform] =~ %r{el-7-x86_64} && host[:hypervisor] =~ %r{docker}
16-
on(host, "sed -i '/nodocs/d' /etc/yum.conf")
17-
end
18-
end
19-
end
3+
configure_beaker

0 commit comments

Comments
 (0)