Unverified Commit f05f78e3 authored by Raphaël Pinson's avatar Raphaël Pinson
Browse files

Modulesync: remove Puppet 3 tests

parent 3b987762

.travis.yml

+1 −7
Original line number Diff line number Diff line
@@ -13,14 +13,8 @@ script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec rake 
matrix:

  fast_finish: true

  include:

  - rvm: 1.9.3

    env: PUPPET_GEM_VERSION="~> 3.0"

  - rvm: 2.0.0

    env: PUPPET_GEM_VERSION="~> 3.0"

  - rvm: 2.0.0

    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"

  - rvm: 2.1.9

    env: PUPPET_GEM_VERSION="~> 4.5.0"

    env: PUPPET_GEM_VERSION="~> 4.0"

  - rvm: 2.3.1

    env: PUPPET_GEM_VERSION="~> 4"

  - rvm: default

Gemfile

+5 −5
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ end 


group :system_tests do

  gem 'beaker',               :require => false

  gem 'beaker-rspec',        :require => false

  gem 'beaker-rspec', '> 5',  :require => false

  gem 'beaker_spec_helper',   :require => false

  gem 'serverspec',           :require => false

  gem 'specinfra',            :require => false

spec/acceptance/nodesets/centos-7.yml

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ HOSTS: 
    docker_preserve_image: true

    docker_cmd: '["/usr/sbin/init"]'

    docker_image_commands:

      - 'yum install -y crontabs tar wget'

      - 'yum install -y crontabs tar wget iproute'

CONFIG:

  type: aio

  log_level: debug

spec/spec_helper.rb

+0 −2
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ require 'pathname' 
dir = Pathname.new(__FILE__).parent

Puppet[:modulepath] = File.join(dir, 'fixtures', 'modules')



RSpec::Expectations.configuration.on_potential_false_positives = :nothing



# There's no real need to make this version dependent, but it helps find

# regressions in Puppet

#