From: David Swan <david.swan@puppet.co.uk>
Date: Wed, 20 May 2020 10:52:06 +0000 (+0100)
Subject: (IAC-746) - Add ubuntu 20.04 support
X-Git-Tag: v2.5.0~6^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=refs%2Fheads%2Fpdksync_IAC-746;p=puppet-modules%2Fpuppetlabs-firewall.git
(IAC-746) - Add ubuntu 20.04 support
---
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0311717..064443f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,7 +6,7 @@ on:
- 'release'
jobs:
- LitmusAcceptance:
+ LitmusAcceptancePuppet5:
env:
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
HONEYCOMB_DATASET: litmus tests
@@ -15,8 +15,27 @@ jobs:
matrix:
ruby_version: [2.5.x]
puppet_gem_version: [~> 6.0]
- platform: [release_checks]
- agent_family: ['puppet5', 'puppet6']
+ platform: [release_checks_5]
+ agent_family: ['puppet5']
+
+ steps:
+ - uses: actions/checkout@v1
+ - name: Litmus Parallel
+ uses: puppetlabs/action-litmus_parallel@master
+ with:
+ platform: ${{ matrix.platform }}
+ agent_family: ${{ matrix.agent_family }}
+ LitmusAcceptancePuppet6:
+ env:
+ HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
+ HONEYCOMB_DATASET: litmus tests
+ runs-on: self-hosted
+ strategy:
+ matrix:
+ ruby_version: [2.5.x]
+ puppet_gem_version: [~> 6.0]
+ platform: [release_checks_6]
+ agent_family: ['puppet6']
steps:
- uses: actions/checkout@v1
diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
index 052a448..c350cd9 100644
--- a/.github/workflows/weekly.yml
+++ b/.github/workflows/weekly.yml
@@ -5,7 +5,7 @@ on:
- cron: '0 1 * * 4'
jobs:
- LitmusAcceptance:
+ LitmusAcceptancePuppet5:
env:
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
HONEYCOMB_DATASET: litmus tests
@@ -14,8 +14,27 @@ jobs:
matrix:
ruby_version: [2.5.x]
puppet_gem_version: [~> 6.0]
- platform: [release_checks]
- agent_family: ['puppet5', 'puppet6']
+ platform: [release_checks_5]
+ agent_family: ['puppet5']
+
+ steps:
+ - uses: actions/checkout@v1
+ - name: Litmus Parallel
+ uses: puppetlabs/action-litmus_parallel@master
+ with:
+ platform: ${{ matrix.platform }}
+ agent_family: ${{ matrix.agent_family }}
+ LitmusAcceptancePuppet6:
+ env:
+ HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
+ HONEYCOMB_DATASET: litmus tests
+ runs-on: self-hosted
+ strategy:
+ matrix:
+ ruby_version: [2.5.x]
+ puppet_gem_version: [~> 6.0]
+ platform: [release_checks_6]
+ agent_family: ['puppet6']
steps:
- uses: actions/checkout@v1
diff --git a/.sync.yml b/.sync.yml
index 4e392a4..cdac38a 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -11,10 +11,20 @@
use_litmus: true
litmus:
provision_list:
- - travis_deb
- - travis_ub
- - travis_el7
- - ---travis_el
+ - ---travis_el
+ - travis_deb
+ - travis_el7
+ complex:
+ - collection:
+ puppet_collection:
+ - puppet6
+ provision_list:
+ - travis_ub_6
+ - collection:
+ puppet_collection:
+ - puppet5
+ provision_list:
+ - travis_ub_5
simplecov: true
notifications:
slack:
diff --git a/.travis.yml b/.travis.yml
index df5a87c..6377e75 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,60 +29,60 @@ jobs:
include:
-
before_script:
- - "bundle exec rake 'litmus:provision_list[travis_deb]'"
- - "bundle exec rake 'litmus:install_agent[puppet5]'"
+ - "bundle exec rake 'litmus:provision_list[travis_ub_6]'"
+ - "bundle exec rake 'litmus:install_agent[puppet6]'"
- "bundle exec rake litmus:install_module"
bundler_args:
dist: trusty
- env: PLATFORMS=travis_deb_puppet5
+ 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]'"
+ - "bundle exec rake 'litmus:provision_list[travis_ub_5]'"
- "bundle exec rake 'litmus:install_agent[puppet5]'"
- "bundle exec rake litmus:install_module"
bundler_args:
dist: trusty
- env: PLATFORMS=travis_ub_puppet5
+ 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_el7]'"
+ - "bundle exec rake 'litmus:provision_list[travis_deb]'"
- "bundle exec rake 'litmus:install_agent[puppet5]'"
- "bundle exec rake litmus:install_module"
bundler_args:
dist: trusty
- env: PLATFORMS=travis_el7_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_deb]'"
- - "bundle exec rake 'litmus:install_agent[puppet6]'"
+ - "bundle exec rake 'litmus:provision_list[travis_el7]'"
+ - "bundle exec rake 'litmus:install_agent[puppet5]'"
- "bundle exec rake litmus:install_module"
bundler_args:
dist: trusty
- 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_ub]'"
+ - "bundle exec rake 'litmus:provision_list[travis_deb]'"
- "bundle exec rake 'litmus:install_agent[puppet6]'"
- "bundle exec rake litmus:install_module"
bundler_args:
dist: trusty
- env: PLATFORMS=travis_ub_puppet6
+ env: PLATFORMS=travis_deb_puppet6
rvm: 2.5.7
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
services: docker
diff --git a/metadata.json b/metadata.json
index 30bdd50..510ad0e 100644
--- a/metadata.json
+++ b/metadata.json
@@ -67,7 +67,8 @@
"operatingsystemrelease": [
"14.04",
"16.04",
- "18.04"
+ "18.04",
+ "20.04"
]
}
],
@@ -78,6 +79,6 @@
}
],
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
- "template-ref": "heads/master-0-g095317c",
+ "template-ref": "heads/master-0-g88b05c7",
"pdk-version": "1.17.0"
}
diff --git a/provision.yaml b/provision.yaml
index b05fe33..46f9130 100644
--- a/provision.yaml
+++ b/provision.yaml
@@ -8,15 +8,21 @@ vagrant:
travis_deb:
provisioner: docker
images: ['litmusimage/debian:8', 'litmusimage/debian:9'] # 'litmusimage/debian10' removed due to failures present only on Docker
-travis_ub:
+travis_ub_5:
provisioner: docker
images: ['litmusimage/ubuntu:14.04', 'litmusimage/ubuntu:16.04', 'litmusimage/ubuntu:18.04']
+travis_ub_6:
+ provisioner: docker
+ images: ['litmusimage/ubuntu:14.04', 'litmusimage/ubuntu:16.04', 'litmusimage/ubuntu:18.04', 'litmusimage/ubuntu:20.04']
travis_el6:
provisioner: docker
images: []
travis_el7:
provisioner: docker
images: ['litmusimage/centos:7']
-release_checks:
+release_checks_5:
provisioner: abs
images: ['redhat-5-x86_64', 'redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-5-x86_64', 'centos-6-x86_64', 'centos-7-x86_64', 'centos-8-x86_64', 'oracle-6-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64', 'debian-10-x86_64', 'sles-11-x86_64', 'sles-12-x86_64', 'sles-15-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64']
+release_checks_6:
+ provisioner: abs
+ images: ['redhat-5-x86_64', 'redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-5-x86_64', 'centos-6-x86_64', 'centos-7-x86_64', 'centos-8-x86_64', 'oracle-6-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64', 'debian-10-x86_64', 'sles-11-x86_64', 'sles-12-x86_64', 'sles-15-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'ubuntu-2004-x86_64']