Skip to content

Commit

Permalink
Use voxpupuli-acceptance
Browse files Browse the repository at this point in the history
This moves a lot of logic from modulesync into a gem. This greatly
reduces the amount of code we have to sync. It also starts to manage
spec_acceptance_helper.rb in various modules when they only need a
trivial helper.
  • Loading branch information
ekohl committed Apr 7, 2020
1 parent a8c06db commit 99eb60e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 18 deletions.
23 changes: 5 additions & 18 deletions config_defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
# values will replace @@SET@@ with the docker_sets' value
- rvm: 2.5.3
services: docker
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=@@SET@@ BEAKER_HYPERVISOR=docker CHECK=beaker
env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=@@SET@@ CHECK=beaker
bundler_args: --without development release
- rvm: 2.5.3
services: docker
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=@@SET@@ BEAKER_HYPERVISOR=docker CHECK=beaker
env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=@@SET@@ CHECK=beaker
bundler_args: --without development release
includes:
- rvm: 2.4.4
Expand Down Expand Up @@ -49,22 +49,7 @@ Gemfile:
- gem: overcommit
version: '>= 0.39.1'
':system_tests':
- gem: winrm
- gem: beaker-rspec
version: '>= 6'
- gem: serverspec
- gem: beaker-hostgenerator
version: '>= 1.1.22'
- gem: beaker-docker
- gem: beaker-puppet
- gem: beaker-puppet_install_helper
- gem: beaker-module_install_helper
require: false
- gem: rbnacl
version: '>= 4'
- gem: rbnacl-libsodium
- gem: bcrypt_pbkdf
- gem: ed25519
- gem: voxpupuli-acceptance
':release':
- gem: github_changelog_generator
git: https://github.com/voxpupuli/github-changelog-generator
Expand Down Expand Up @@ -120,6 +105,8 @@ spec/acceptance/nodesets/windows-2012R2-serverstandard-x64.yml:
delete: true
spec/spec_helper.rb:
mock_with: false
spec/spec_helper_acceptance.rb:
unmanaged: true
CONTRIBUTING.md:
delete: true
...
Expand Down
3 changes: 3 additions & 0 deletions moduleroot/spec/spec_helper_acceptance.rb.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
require 'voxpupuli/acceptance/spec_helper_acceptance'

configure_beaker

0 comments on commit 99eb60e

Please sign in to comment.