From: Adrian Iurca <45214757+adrianiurca@users.noreply.github.com>
Date: Wed, 25 Nov 2020 16:58:26 +0000 (+0200)
Subject: Merge branch 'main' into pdksyng_travis_centos_8
X-Git-Tag: v2.8.0~7^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ff5d41fbcf918ee48ab6301dbe9bcbca8468d8d6;p=puppet-modules%2Fpuppetlabs-firewall.git

Merge branch 'main' into pdksyng_travis_centos_8
---

ff5d41fbcf918ee48ab6301dbe9bcbca8468d8d6
diff --cc .sync.yml
index 05a7873,d44e575..f79d858
--- a/.sync.yml
+++ b/.sync.yml
@@@ -12,32 -12,21 +12,33 @@@
    use_litmus: true
    litmus:
      provision_list:
-       - ---travis_el
-       - travis_deb
-       - travis_el7
+     - ---travis_el
+     - travis_deb
+     - travis_el7
+     - travis_el8
      complex:
 -    - collection:
 -        puppet_collection:
 -        - puppet6
 -        provision_list:
 -        - travis_ub_6
 -    - collection:
 -        puppet_collection:
 -        - puppet5
 -        provision_list:
 -        - travis_ub_5
 +      - collection:
 +          puppet_collection:
 +            - puppet6
 +          provision_list:
 +            - travis_ub_6
 +      - collection:
 +          puppet_collection:
 +            - puppet5
 +          provision_list:
 +            - travis_ub_5
 +      - collection:
 +          puppet_collection:
 +            - puppet5
 +          provision_list:
 +            - travis_el8
 +          dist: xenial
 +      - collection:
 +          puppet_collection:
 +            - puppet6
 +          provision_list:
 +            - travis_el8
 +          dist: xenial
    simplecov: true
    notifications:
      slack:
diff --cc .travis.yml
index f5a95c0,7c031db..aa26f24
--- a/.travis.yml
+++ b/.travis.yml
@@@ -27,92 -27,84 +27,87 @@@ stages
  jobs:
    fast_finish: true
    include:
-     -
-       before_script:
-       - "bundle exec rake 'litmus:provision_list[travis_ub_6]'"
-       - "bundle exec rake 'litmus:install_agent[puppet6]'"
-       - "bundle exec rake litmus:install_module"
+     - before_script:
+         - "bundle exec rake 'litmus:provision_list[travis_ub_6]'"
+         - "bundle exec rake 'litmus:install_agent[puppet6]'"
 -        - "bundle exec rake 'litmus:install_module'"
++        - "bundle exec rake litmus:install_module"
        bundler_args:
        env: PLATFORMS=travis_ub_6_puppet6
        rvm: 2.5.7
        script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
        services: docker
        stage: acceptance
-     -
-       before_script:
-       - "bundle exec rake 'litmus:provision_list[travis_ub_5]'"
-       - "bundle exec rake 'litmus:install_agent[puppet5]'"
-       - "bundle exec rake litmus:install_module"
+     - before_script:
+         - "bundle exec rake 'litmus:provision_list[travis_ub_5]'"
+         - "bundle exec rake 'litmus:install_agent[puppet5]'"
 -        - "bundle exec rake 'litmus:install_module'"
++        - "bundle exec rake litmus:install_module"
        bundler_args:
        env: PLATFORMS=travis_ub_5_puppet5
        rvm: 2.5.7
        script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
        services: docker
        stage: acceptance
 -    - before_script:
 -        - "bundle exec rake 'litmus:provision_list[travis_deb]'"
 +    -
 +      before_script:
-       - "bundle exec rake 'litmus:provision_list[travis_el8]'"
-       - "bundle exec rake 'litmus:install_agent[puppet5]'"
-       - "bundle exec rake litmus:install_module"
++        - "bundle exec rake 'litmus:provision_list[travis_el8]'"
+         - "bundle exec rake 'litmus:install_agent[puppet5]'"
 -        - "bundle exec rake 'litmus:install_module'"
++        - "bundle exec rake litmus:install_module"
        bundler_args:
 -      env: PLATFORMS=travis_deb_puppet5
 +      dist: xenial
 +      env: PLATFORMS=travis_el8_puppet5
        rvm: 2.5.7
        script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
        services: docker
        stage: acceptance
 -    - before_script:
 -        - "bundle exec rake 'litmus:provision_list[travis_el7]'"
 -        - "bundle exec rake 'litmus:install_agent[puppet5]'"
 -        - "bundle exec rake 'litmus:install_module'"
 +    -
 +      before_script:
-       - "bundle exec rake 'litmus:provision_list[travis_el8]'"
-       - "bundle exec rake 'litmus:install_agent[puppet6]'"
-       - "bundle exec rake litmus:install_module"
++        - "bundle exec rake 'litmus:provision_list[travis_el8]'"
++        - "bundle exec rake 'litmus:install_agent[puppet6]'"
++        - "bundle exec rake litmus:install_module"
        bundler_args:
 -      env: PLATFORMS=travis_el7_puppet5
 +      dist: xenial
 +      env: PLATFORMS=travis_el8_puppet6
        rvm: 2.5.7
        script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
        services: docker
        stage: acceptance
 -    - before_script:
 -        - "bundle exec rake 'litmus:provision_list[travis_el8]'"
 +    -
 +      before_script:
-       - "bundle exec rake 'litmus:provision_list[travis_deb]'"
-       - "bundle exec rake 'litmus:install_agent[puppet5]'"
-       - "bundle exec rake litmus:install_module"
++        - "bundle exec rake 'litmus:provision_list[travis_deb]'"
+         - "bundle exec rake 'litmus:install_agent[puppet5]'"
 -        - "bundle exec rake 'litmus:install_module'"
++        - "bundle exec rake litmus:install_module"
        bundler_args:
 -      dist: xenial
 -      env: PLATFORMS=travis_el8_puppet5
 +      env: PLATFORMS=travis_deb_puppet5
        rvm: 2.5.7
        script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
        services: docker
        stage: acceptance
-     -
-       before_script:
-       - "bundle exec rake 'litmus:provision_list[travis_el7]'"
-       - "bundle exec rake 'litmus:install_agent[puppet5]'"
-       - "bundle exec rake litmus:install_module"
+     - before_script:
 -        - "bundle exec rake 'litmus:provision_list[travis_deb]'"
 -        - "bundle exec rake 'litmus:install_agent[puppet6]'"
 -        - "bundle exec rake 'litmus:install_module'"
++        - "bundle exec rake 'litmus:provision_list[travis_el7]'"
++        - "bundle exec rake 'litmus:install_agent[puppet5]'"
++        - "bundle exec rake litmus:install_module"
        bundler_args:
 -      env: PLATFORMS=travis_deb_puppet6
 +      env: PLATFORMS=travis_el7_puppet5
        rvm: 2.5.7
        script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
        services: docker
        stage: acceptance
-     -
-       before_script:
-       - "bundle exec rake 'litmus:provision_list[travis_deb]'"
-       - "bundle exec rake 'litmus:install_agent[puppet6]'"
-       - "bundle exec rake litmus:install_module"
+     - before_script:
 -        - "bundle exec rake 'litmus:provision_list[travis_el7]'"
++        - "bundle exec rake 'litmus:provision_list[travis_deb]'"
+         - "bundle exec rake 'litmus:install_agent[puppet6]'"
 -        - "bundle exec rake 'litmus:install_module'"
++        - "bundle exec rake litmus:install_module"
        bundler_args:
 -      env: PLATFORMS=travis_el7_puppet6
 +      env: PLATFORMS=travis_deb_puppet6
        rvm: 2.5.7
        script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
        services: docker
        stage: acceptance
-     -
-       before_script:
-       - "bundle exec rake 'litmus:provision_list[travis_el7]'"
-       - "bundle exec rake 'litmus:install_agent[puppet6]'"
-       - "bundle exec rake litmus:install_module"
+     - before_script:
 -        - "bundle exec rake 'litmus:provision_list[travis_el8]'"
++        - "bundle exec rake 'litmus:provision_list[travis_el7]'"
+         - "bundle exec rake 'litmus:install_agent[puppet6]'"
 -        - "bundle exec rake 'litmus:install_module'"
++        - "bundle exec rake litmus:install_module"
        bundler_args:
 -      dist: xenial
 -      env: PLATFORMS=travis_el8_puppet6
 +      env: PLATFORMS=travis_el7_puppet6
        rvm: 2.5.7
        script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
        services: docker