PDKSync: Puppet 7 test config

diff --git a/.travis.yml b/.travis.yml
index 6338edd7bfa1b1269f50c36ad724f0f9ab16b4df..ba1bff2b49f9267749cf1669a3f5f60650d126e6 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,120 +1,126 @@
 ---
 os: linux
-dist: xenial
+dist: bionic
 language: ruby
 cache: bundler
 before_install:
-  - bundle -v
-  - rm -f Gemfile.lock
-  - "# Update system gems if requested. This is useful to temporarily workaround troubles in the test runner"
-  - "# See https://github.com/puppetlabs/pdk-templates/commit/705154d5c437796b821691b707156e1b056d244f for an example of how this was used"
-  - "# Ignore exit code of SIGPIPE'd yes to not fail with shell's pipefail set"
-  - '[ -z "$RUBYGEMS_VERSION" ] || (yes || true) | gem update --system $RUBYGEMS_VERSION'
-  - gem --version
-  - bundle -v
+- bundle -v
+- rm -f Gemfile.lock
+- "# Update system gems if requested. This is useful to temporarily workaround troubles
+  in the test runner"
+- "# See https://github.com/puppetlabs/pdk-templates/commit/705154d5c437796b821691b707156e1b056d244f
+  for an example of how this was used"
+- "# Ignore exit code of SIGPIPE'd yes to not fail with shell's pipefail set"
+- '[ -z "$RUBYGEMS_VERSION" ] || (yes || true) | gem update --system $RUBYGEMS_VERSION'
+- gem --version
+- bundle -v
 script:
-  - 'SIMPLECOV=yes bundle exec rake $CHECK'
-bundler_args: --without system_tests
+- SIMPLECOV=yes bundle exec rake $CHECK
+bundler_args: "--without system_tests"
 rvm:
-  - 2.5.7
+- 2.7.0
 env:
   global:
-    - HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests"
+  - HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus
+    tests"
 stages:
-  - static
-  - spec
-  - acceptance
+- acceptance
 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"
-      bundler_args:
-      dist: trusty
-      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"
-      bundler_args:
-      dist: trusty
-      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]'"
-      - "bundle exec rake 'litmus:install_agent[puppet5]'"
-      - "bundle exec rake litmus:install_module"
-      bundler_args:
-      dist: trusty
-      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"
-      bundler_args:
-      dist: trusty
-      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"
-      bundler_args:
-      dist: trusty
-      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"
-      bundler_args:
-      dist: trusty
-      env: PLATFORMS=travis_el7_puppet6
-      rvm: 2.5.7
-      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
-      services: docker
-      stage: acceptance
-    -
-      env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
-      stage: static
-    -
-      env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
-      rvm: 2.4.5
-      stage: spec
-    -
-      env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
-      rvm: 2.5.7
-      stage: spec
+  - before_script:
+    - bundle exec rake 'litmus:provision_list[travis_puppet7_centos_7]'
+    - bundle exec rake 'litmus:install_agent[puppet7-nightly]'
+    - bundle exec rake litmus:install_module
+    bundler_args:
+    env: PLATFORMS=travis_puppet7_centos_7
+    rvm: 2.7.0
+    script:
+    - travis_wait 45 bundle exec rake litmus:acceptance:parallel
+    services: docker
+    stage: acceptance
+  - before_script:
+    - bundle exec rake 'litmus:provision_list[travis_puppet7_centos_8]'
+    - bundle exec rake 'litmus:install_agent[puppet7-nightly]'
+    - bundle exec rake litmus:install_module
+    bundler_args:
+    env: PLATFORMS=travis_puppet7_centos_8
+    rvm: 2.7.0
+    script:
+    - travis_wait 45 bundle exec rake litmus:acceptance:parallel
+    services: docker
+    stage: acceptance
+  - before_script:
+    - bundle exec rake 'litmus:provision_list[travis_puppet7_oraclelinux_7]'
+    - bundle exec rake 'litmus:install_agent[puppet7-nightly]'
+    - bundle exec rake litmus:install_module
+    bundler_args:
+    env: PLATFORMS=travis_puppet7_oraclelinux_7
+    rvm: 2.7.0
+    script:
+    - travis_wait 45 bundle exec rake litmus:acceptance:parallel
+    services: docker
+    stage: acceptance
+  - before_script:
+    - bundle exec rake 'litmus:provision_list[travis_puppet7_scientificlinux_7]'
+    - bundle exec rake 'litmus:install_agent[puppet7-nightly]'
+    - bundle exec rake litmus:install_module
+    bundler_args:
+    env: PLATFORMS=travis_puppet7_scientificlinux_7
+    rvm: 2.7.0
+    script:
+    - travis_wait 45 bundle exec rake litmus:acceptance:parallel
+    services: docker
+    stage: acceptance
+  - before_script:
+    - bundle exec rake 'litmus:provision_list[travis_puppet7_debian_9]'
+    - bundle exec rake 'litmus:install_agent[puppet7-nightly]'
+    - bundle exec rake litmus:install_module
+    bundler_args:
+    env: PLATFORMS=travis_puppet7_debian_9
+    rvm: 2.7.0
+    script:
+    - travis_wait 45 bundle exec rake litmus:acceptance:parallel
+    services: docker
+    stage: acceptance
+  - before_script:
+    - bundle exec rake 'litmus:provision_list[travis_puppet7_debian_10]'
+    - bundle exec rake 'litmus:install_agent[puppet7-nightly]'
+    - bundle exec rake litmus:install_module
+    bundler_args:
+    env: PLATFORMS=travis_puppet7_debian_10
+    rvm: 2.7.0
+    script:
+    - travis_wait 45 bundle exec rake litmus:acceptance:parallel
+    services: docker
+    stage: acceptance
+  - before_script:
+    - bundle exec rake 'litmus:provision_list[travis_puppet7_ubuntu_18_04]'
+    - bundle exec rake 'litmus:install_agent[puppet7-nightly]'
+    - bundle exec rake litmus:install_module
+    bundler_args:
+    env: PLATFORMS=travis_puppet7_ubuntu_18_04
+    rvm: 2.7.0
+    script:
+    - travis_wait 45 bundle exec rake litmus:acceptance:parallel
+    services: docker
+    stage: acceptance
+  - before_script:
+    - bundle exec rake 'litmus:provision_list[travis_puppet7_ubuntu_20_04]'
+    - bundle exec rake 'litmus:install_agent[puppet7-nightly]'
+    - bundle exec rake litmus:install_module
+    bundler_args:
+    env: PLATFORMS=travis_puppet7_ubuntu_20_04
+    rvm: 2.7.0
+    script:
+    - travis_wait 45 bundle exec rake litmus:acceptance:parallel
+    services: docker
+    stage: acceptance
 branches:
   only:
-    - main
-    - /^v\d/
-    - release
+  - main
+  - "/^v\\d/"
+  - release
 notifications:
   email: false
   slack:

diff --git a/provision.yaml b/provision.yaml
index cdc3839acb77bacaaeadf41b8c62d6a19336bfec..a1bd7c827b5712a3034b72cb1d517883b3dd9c93 100644 (file)
--- a/provision.yaml
+++ b/provision.yaml
@@ -1,28 +1,127 @@
 ---
 default:
   provisioner: docker
-  images: ['litmusimage/centos:7']
+  images:
+  - litmusimage/centos:7
 vagrant:
   provisioner: vagrant
-  images: ['centos/7', 'generic/ubuntu1804']
+  images:
+  - centos/7
+  - generic/ubuntu1804
 travis_deb:
   provisioner: docker
-  images: ['litmusimage/debian:8', 'litmusimage/debian:9'] # 'litmusimage/debian10' removed due to failures present only on Docker
+  images:
+  - litmusimage/debian:8
+  - litmusimage/debian:9
 travis_ub_5:
   provisioner: docker
-  images: ['litmusimage/ubuntu:14.04', 'litmusimage/ubuntu:16.04', 'litmusimage/ubuntu:18.04']
+  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']
+  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']
+  images:
+  - litmusimage/centos:7
 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-12-x86_64', 'sles-15-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64']
+  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-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-12-x86_64', 'sles-15-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'ubuntu-2004-x86_64']
+  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-12-x86_64
+  - sles-15-x86_64
+  - ubuntu-1404-x86_64
+  - ubuntu-1604-x86_64
+  - ubuntu-1804-x86_64
+  - ubuntu-2004-x86_64
+release_checks_7:
+  provisioner: abs
+  images:
+  - redhat-7-x86_64
+  - redhat-8-x86_64
+  - centos-7-x86_64
+  - centos-8-x86_64
+  - oracle-7-x86_64
+  - scientific-7-x86_64
+  - sles-12-x86_64
+  - sles-15-x86_64
+  - debian-9-x86_64
+  - debian-10-x86_64
+  - ubuntu-18.04-x86_64
+  - ubuntu-20.04-x86_64
+travis_puppet7_centos_7:
+  provisioner: docker
+  images:
+  - litmusimage/centos:7
+travis_puppet7_centos_8:
+  provisioner: docker
+  images:
+  - litmusimage/centos:8
+travis_puppet7_oraclelinux_7:
+  provisioner: docker
+  images:
+  - litmusimage/oraclelinux:7
+travis_puppet7_scientificlinux_7:
+  provisioner: docker
+  images:
+  - litmusimage/scientificlinux:7
+travis_puppet7_debian_9:
+  provisioner: docker
+  images:
+  - litmusimage/debian:9
+travis_puppet7_debian_10:
+  provisioner: docker
+  images:
+  - litmusimage/debian:10
+travis_puppet7_ubuntu_18_04:
+  provisioner: docker
+  images:
+  - litmusimage/ubuntu:18.04
+travis_puppet7_ubuntu_20_04:
+  provisioner: docker
+  images:
+  - litmusimage/ubuntu:20.04