Unverified Commit 8476cb87 authored by Raphaël Pinson's avatar Raphaël Pinson Committed by GitHub
Browse files

Fix manage_aliases (#272) 

* Only manage_root_alias if manage_aliases

* Not managed != not existing

* Remove debian6 and debian7 acceptance tests
parent 27419439

.sync.yml

+0 −39
Original line number Diff line number Diff line
@@ -25,18 +25,6 @@ 
    -

      env: DEPLOY_TO_FORGE=yes

      stage: deploy

    - rvm: default

      sudo: required

      services: docker

      env:

        - PUPPET_INSTALL_TYPE=agent

        - BEAKER_IS_PE=no

        - BEAKER_PUPPET_COLLECTION=puppet5

        - BEAKER_debug=true

        - BEAKER_setfile=debian7-64{hypervisor=docker}

      bundler_args:

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

      stage: acceptance

    - rvm: default

      sudo: required

      services: docker
@@ -120,33 +108,6 @@ 
      bundler_args:

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

      stage: acceptance

  allow_failures:

  # Exim is not properly stopped on these OSes, which makes the run non

  # idempotent

  - rvm: default

    sudo: required

    services: docker

    env:

      - PUPPET_INSTALL_TYPE=agent

      - BEAKER_IS_PE=no

      - BEAKER_PUPPET_COLLECTION=puppet5

      - BEAKER_debug=true

      - BEAKER_setfile=debian6-64{hypervisor=docker}

    bundler_args:

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

    stage: acceptance

  - rvm: default

    sudo: required

    services: docker

    env:

      - PUPPET_INSTALL_TYPE=agent

      - BEAKER_IS_PE=no

      - BEAKER_PUPPET_COLLECTION=puppet5

      - BEAKER_debug=true

      - BEAKER_setfile=debian7-64{hypervisor=docker}

    bundler_args:

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

    stage: acceptance



Gemfile:

  required:

.travis.yml

+0 −25
Original line number Diff line number Diff line
@@ -43,14 +43,6 @@ matrix: 
    -

      env: DEPLOY_TO_FORGE=yes

      stage: deploy

    -

      bundler_args: 

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

      rvm: default

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

      services: docker

      stage: acceptance

      sudo: required

    -

      bundler_args: 

      env: ["PUPPET_INSTALL_TYPE=agent", "BEAKER_IS_PE=no", "BEAKER_PUPPET_COLLECTION=puppet5", "BEAKER_debug=true", "BEAKER_setfile=debian8-64{hypervisor=docker}"]
@@ -109,23 +101,6 @@ matrix: 
    -

      env: DEPLOY_TO_FORGE=yes

      stage: deploy

  allow_failures:

    -

      bundler_args: 

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

      rvm: default

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

      services: docker

      stage: acceptance

      sudo: required

    -

      bundler_args: 

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

      rvm: default

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

      services: docker

      stage: acceptance

      sudo: required

branches:

  only:

    - master

manifests/files.pp

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ class postfix::files { 
    default: {}

  }



  if $manage_root_alias {

  if $manage_aliases and $manage_root_alias {

    postfix::mailalias {'root':

      recipient => $root_mail_recipient,

    }

spec/acceptance/postfix_spec.rb

+0 −4
Original line number Diff line number Diff line
@@ -72,9 +72,5 @@ describe 'postfix class' do 
      apply_manifest(pp, catch_failures: true)

      apply_manifest(pp, catch_changes: true)

    end



    describe file('/etc/aliases') do

      it { is_expected.not_to exist }

    end

  end

end