Skip to content

Commit

Permalink
Use beaker-hostgenerator for docker acceptance tests
Browse files Browse the repository at this point in the history
This also removes sudo: required and dist: trusty since that's implied
by Travis when using docker.
  • Loading branch information
ekohl committed Apr 10, 2018
1 parent 2403bcd commit 923c21a
Show file tree
Hide file tree
Showing 10 changed files with 3 additions and 180 deletions.
6 changes: 3 additions & 3 deletions config_defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@
docker_defaults:
# values will replace @@SET@@ with the docker_sets' value
rvm: 2.4.3
sudo: required
dist: trusty
services: docker
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=@@SET@@ CHECK=beaker
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_setfile=@@SET@@{hypervisor=docker} CHECK=beaker
bundler_args: --without development release
includes:
- rvm: 2.1.9
Expand Down Expand Up @@ -69,6 +67,8 @@ Gemfile:
- gem: winrm
- gem: beaker-rspec
- gem: serverspec
- gem: beaker-hostgenerator
version: '>= 1.1.10'
- gem: beaker-puppet_install_helper
- gem: beaker-module_install_helper
require: false
Expand Down
19 changes: 0 additions & 19 deletions moduleroot/spec/acceptance/nodesets/docker/centos-5.yml.erb

This file was deleted.

20 changes: 0 additions & 20 deletions moduleroot/spec/acceptance/nodesets/docker/centos-6.yml.erb

This file was deleted.

19 changes: 0 additions & 19 deletions moduleroot/spec/acceptance/nodesets/docker/centos-7.yml.erb

This file was deleted.

18 changes: 0 additions & 18 deletions moduleroot/spec/acceptance/nodesets/docker/debian-7.yml.erb

This file was deleted.

20 changes: 0 additions & 20 deletions moduleroot/spec/acceptance/nodesets/docker/debian-8.yml.erb

This file was deleted.

20 changes: 0 additions & 20 deletions moduleroot/spec/acceptance/nodesets/docker/debian-9.yml.erb

This file was deleted.

19 changes: 0 additions & 19 deletions moduleroot/spec/acceptance/nodesets/docker/ubuntu-12.04.yml.erb

This file was deleted.

21 changes: 0 additions & 21 deletions moduleroot/spec/acceptance/nodesets/docker/ubuntu-14.04.yml.erb

This file was deleted.

21 changes: 0 additions & 21 deletions moduleroot/spec/acceptance/nodesets/docker/ubuntu-16.04.yml.erb

This file was deleted.

0 comments on commit 923c21a

Please sign in to comment.