Skip to content

Commit d45d213

Browse files
committed
Use voxpupuli-acceptance
1 parent e034c51 commit d45d213

File tree

4 files changed

+15
-47
lines changed

4 files changed

+15
-47
lines changed

.sync.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@
99
- set: centos7-64
1010
spec/spec_helper.rb:
1111
mock_with: ':mocha'
12+
spec/spec_helper_acceptance.rb:
13+
unmanaged: false

.travis.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,43 +24,43 @@ 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=ubuntu1604-64 BEAKER_HYPERVISOR=docker CHECK=beaker
27+
env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=ubuntu1604-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=ubuntu1604-64 BEAKER_HYPERVISOR=docker CHECK=beaker
31+
env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=ubuntu1604-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=ubuntu1804-64 BEAKER_HYPERVISOR=docker CHECK=beaker
35+
env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=ubuntu1804-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=ubuntu1804-64 BEAKER_HYPERVISOR=docker CHECK=beaker
39+
env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=ubuntu1804-64 CHECK=beaker
4040
services: docker
4141
- rvm: 2.5.3
4242
bundler_args: --without development release
43-
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian8-64 BEAKER_HYPERVISOR=docker CHECK=beaker
43+
env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=debian8-64 CHECK=beaker
4444
services: docker
4545
- rvm: 2.5.3
4646
bundler_args: --without development release
47-
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian8-64 BEAKER_HYPERVISOR=docker CHECK=beaker
47+
env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=debian8-64 CHECK=beaker
4848
services: docker
4949
- rvm: 2.5.3
5050
bundler_args: --without development release
51-
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian9-64 BEAKER_HYPERVISOR=docker CHECK=beaker
51+
env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=debian9-64 CHECK=beaker
5252
services: docker
5353
- rvm: 2.5.3
5454
bundler_args: --without development release
55-
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian9-64 BEAKER_HYPERVISOR=docker CHECK=beaker
55+
env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=debian9-64 CHECK=beaker
5656
services: docker
5757
- rvm: 2.5.3
5858
bundler_args: --without development release
59-
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos7-64 BEAKER_HYPERVISOR=docker CHECK=beaker
59+
env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=centos7-64 CHECK=beaker
6060
services: docker
6161
- rvm: 2.5.3
6262
bundler_args: --without development release
63-
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=centos7-64 BEAKER_HYPERVISOR=docker CHECK=beaker
63+
env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=centos7-64 CHECK=beaker
6464
services: docker
6565
branches:
6666
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 & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +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-
8-
RSpec.configure do |c|
9-
# Readable test descriptions
10-
c.formatter = :documentation
11-
12-
# Configure all nodes in nodeset
13-
c.before :suite do
14-
install_module
15-
install_module_dependencies
16-
end
17-
end
3+
configure_beaker

0 commit comments

Comments
 (0)