Unverified Commit b3d8591c authored by Tobias Wolter's avatar Tobias Wolter Committed by GitHub
Browse files

Fix CI (#291) 

* Fix hardcoded map path

The relationship definition for the map path in `Postfix::Transport` was
hardcoded, so that any non-standard `$file` parameter did not create an
automatic refresh of the map, even if it is defined as a
`Postfix::Hash`.

Fixed be replacing the hardcoded string with the `$file` variable, which
means no change with expected behaviour.

* Beaker dependencies in Gemfile

* Remove CentOS 6
parent 65b3d6f3

.sync.yml

+0 −12
Original line number Diff line number Diff line
@@ -87,18 +87,6 @@ 
        - BEAKER_setfile=ubuntu1804-64{hypervisor=docker}

      bundler_args:

      script: bundle exec rspec spec/acceptance/*_spec.rb

    - rvm: default

      sudo: required

      services: docker

      env:

        - PUPPET_INSTALL_TYPE=agent

        - BEAKER_IS_PE=no

        - BEAKER_PUPPET_COLLECTION=puppet5

        - BEAKER_debug=true

        - BEAKER_setfile=centos6-64{hypervisor=docker}

      bundler_args:

      script: bundle exec rspec spec/acceptance/*_spec.rb

      stage: acceptance

    - rvm: default

      sudo: required

      services: docker

.travis.yml

+0 −8
Original line number Diff line number Diff line
@@ -79,14 +79,6 @@ matrix: 
      script: bundle exec rspec spec/acceptance/*_spec.rb

      services: docker

      sudo: required

    -

      bundler_args: "--with system_tests"

      env: ["PUPPET_INSTALL_TYPE=agent", "BEAKER_IS_PE=no", "BEAKER_PUPPET_COLLECTION=puppet5", "BEAKER_debug=true", "BEAKER_setfile=centos6-64{hypervisor=docker}"]

      rvm: default

      script: bundle exec rspec spec/acceptance/*_spec.rb

      services: docker

      stage: acceptance

      sudo: required

    -

      bundler_args: "--with system_tests"

      env: ["PUPPET_INSTALL_TYPE=agent", "BEAKER_IS_PE=no", "BEAKER_PUPPET_COLLECTION=puppet5", "BEAKER_debug=true", "BEAKER_setfile=centos7-64{hypervisor=docker}"]

Gemfile

+8 −1
Original line number Diff line number Diff line
@@ -32,7 +32,14 @@ group :development do 
  gem "github_changelog_generator",                              require: false

end

group :system_tests do

  gem "beaker-hostgenerator",                         require: false

  gem 'beaker',                                       require: false

  gem 'beaker-docker',                                require: false

  gem 'beaker-hostgenerator',                         require: false

  gem 'beaker-module_install_helper',                 require: false

  gem 'beaker-pe',                                    require: false

  gem 'beaker-puppet_install_helper',                 require: false

  gem 'beaker-rspec',                                 require: false

  gem 'beaker-task_helper',                           require: false

  gem "puppet-module-posix-system-r#{minor_version}", require: false

end

spec/acceptance/nodesets/centos-5.yml

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
HOSTS:

  centos-5-x64:

    default_apply_opts:

      order: random

      strict_variables:

    platform: el-5-x86_64

    hypervisor : docker

    image: camptocamp/centos:5

    docker_preserve_image: true

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

    docker_image_commands:

      - 'yum install -y crontabs tar wget which'

      - 'sed -i -e "/mingetty/d" /etc/inittab'

CONFIG:

  type: aio

  log_level: debug

spec/acceptance/nodesets/centos-6.yml

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
HOSTS:

  centos-6-x64:

    default_apply_opts:

      order: random

      strict_variables:

    platform: el-6-x86_64

    hypervisor : docker

    image: centos:6

    docker_preserve_image: true

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

    docker_image_commands:

      - 'rm -rf /var/run/network/*'

      - 'yum install -y crontabs tar wget'

      - 'rm /etc/init/tty.conf'

CONFIG:

  type: aio

  log_level: debug