Skip to content

Commit

Permalink
Revert "Adding dockers to CI"
Browse files Browse the repository at this point in the history
This reverts commit b3d311b.
  • Loading branch information
jskarpe committed Sep 29, 2016
1 parent b8eb5a5 commit b5e7b62
Show file tree
Hide file tree
Showing 9 changed files with 4 additions and 150 deletions.
45 changes: 0 additions & 45 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,51 +33,6 @@ matrix:
env: PUPPET_VERSION="~> 4.0" CHECK=test
- rvm: 2.4.0-preview1
env: PUPPET_VERSION="~> 4.0" CHECK=test
- rvm: 2.1
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/centos-7 PUPPET_INSTALL_TYPE=foss PUPPET_INSTALL_VERSION=3.8.7
services: docker
sudo: required
bundler_args: --without development
- rvm: 2.1
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04 PUPPET_INSTALL_TYPE=foss PUPPET_INSTALL_VERSION=3.8.7
services: docker
sudo: required
bundler_args: --without development
- rvm: 2.3.1
env: PUPPET_VERSION="~> 4.0" CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/centos-6 PUPPET_INSTALL_TYPE=agent PUPPET_INSTALL_VERSION=1.5.1
services: docker
sudo: required
bundler_args: --without development
- rvm: 2.3.1
env: PUPPET_VERSION="~> 4.0" CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/centos-7 PUPPET_INSTALL_TYPE=agent PUPPET_INSTALL_VERSION=1.5.1
services: docker
sudo: required
bundler_args: --without development
- rvm: 2.3.1
env: PUPPET_VERSION="~> 4.0" CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/debian-7 PUPPET_INSTALL_TYPE=agent PUPPET_INSTALL_VERSION=1.5.1
services: docker
sudo: required
bundler_args: --without development
- rvm: 2.3.1
env: PUPPET_VERSION="~> 4.0" CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/debian-8 PUPPET_INSTALL_TYPE=agent PUPPET_INSTALL_VERSION=1.5.1
services: docker
sudo: required
bundler_args: --without development
- rvm: 2.3.1
env: PUPPET_VERSION="~> 4.0" CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/ubuntu-12.04 PUPPET_INSTALL_TYPE=agent PUPPET_INSTALL_VERSION=1.5.1
services: docker
sudo: required
bundler_args: --without development
- rvm: 2.3.1
env: PUPPET_VERSION="~> 4.0" CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04 PUPPET_INSTALL_TYPE=agent PUPPET_INSTALL_VERSION=1.5.1
services: docker
sudo: required
bundler_args: --without development
- rvm: 2.3.1
env: PUPPET_VERSION="~> 4.0" CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/ubuntu-16.04 PUPPET_INSTALL_TYPE=agent PUPPET_INSTALL_VERSION=1.5.1
services: docker
sudo: required
bundler_args: --without development
allow_failures:
- rvm: 2.4.0-preview1
notifications:
Expand Down
13 changes: 0 additions & 13 deletions spec/acceptance/nodesets/docker/centos-6.yml

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

6 changes: 4 additions & 2 deletions spec/spec_helper_acceptance.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
require 'beaker-rspec'
require 'beaker-rspec/spec_helper'
require 'beaker-rspec/helpers/serverspec'
require 'beaker/puppet_install_helper'

install_puppet_agent_on hosts, {} unless ENV['BEAKER_provision'] == 'no'
run_puppet_install_helper

RSpec.configure do |c|
# Project root
Expand Down

0 comments on commit b5e7b62

Please sign in to comment.