From ec69bd6f5b081ae7f846dd1cd6da6637b232b626 Mon Sep 17 00:00:00 2001 From: David Swan Date: Wed, 20 May 2020 11:52:06 +0100 Subject: [PATCH] (IAC-746) - Add ubuntu 20.04 support --- .github/workflows/release.yml | 26 ++++++++++++++++++++++---- .github/workflows/weekly.yml | 25 ++++++++++++++++++++++--- .sync.yml | 16 +++++++++++++--- .travis.yml | 18 +++++++++--------- metadata.json | 5 +++-- provision.yaml | 16 +++++++++++----- 6 files changed, 80 insertions(+), 26 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4132656486..064443f2f9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,18 +6,36 @@ on: - 'release' jobs: - LitmusAcceptance: + LitmusAcceptancePuppet5: env: HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6 HONEYCOMB_DATASET: litmus tests - CI: true runs-on: self-hosted strategy: 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 d8bec07213..8d23ec342f 100644 --- a/.github/workflows/weekly.yml +++ b/.github/workflows/weekly.yml @@ -5,7 +5,7 @@ on: - cron: '0 6 * * 1' 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 c15eb027e7..9abec6a81b 100644 --- a/.sync.yml +++ b/.sync.yml @@ -17,9 +17,19 @@ use_litmus: true litmus: provision_list: - - travis_deb - - travis_ub - - ---travis_el + - ---travis_el + - travis_deb + 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 2b4079725b..1cb791fea8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,22 +29,22 @@ 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: - 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: - 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 @@ -52,21 +52,21 @@ jobs: - before_script: - "bundle exec rake 'litmus:provision_list[travis_deb]'" - - "bundle exec rake 'litmus:install_agent[puppet6]'" + - "bundle exec rake 'litmus:install_agent[puppet5]'" - "bundle exec rake litmus:install_module" bundler_args: - env: PLATFORMS=travis_deb_puppet6 + 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_ub]'" + - "bundle exec rake 'litmus:provision_list[travis_deb]'" - "bundle exec rake 'litmus:install_agent[puppet6]'" - "bundle exec rake litmus:install_module" bundler_args: - 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 8f9e26df89..10dcc476ff 100644 --- a/metadata.json +++ b/metadata.json @@ -31,7 +31,8 @@ "operatingsystemrelease": [ "14.04", "16.04", - "18.04" + "18.04", + "20.04" ] } ], @@ -42,6 +43,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 1af4651858..ebd550ef7d 100644 --- a/provision.yaml +++ b/provision.yaml @@ -8,15 +8,21 @@ vagrant: travis_deb: provisioner: docker images: ['litmusimage/debian:9', 'litmusimage/debian:10'] -travis_ub: - provisioner: docker +travis_ub_5: + provisioner: docker images: ['litmusimage/ubuntu:16.04', 'litmusimage/ubuntu:18.04'] +travis_ub_6: + provisioner: docker + images: ['litmusimage/ubuntu:16.04', 'litmusimage/ubuntu:18.04', 'litmusimage/ubuntu:20.04'] travis_el6: - provisioner: docker + provisioner: docker images: [] travis_el7: - provisioner: docker + provisioner: docker images: [] -release_checks: +release_checks_5: provisioner: abs images: ['debian-8-x86_64', 'debian-9-x86_64', 'debian-10-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64'] +release_checks_6: + provisioner: abs + images: ['debian-8-x86_64', 'debian-9-x86_64', 'debian-10-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'ubuntu-2004-x86_64']