From 84654700bca2328b0c4f495d6159f50275031251 Mon Sep 17 00:00:00 2001 From: David Swan Date: Fri, 14 Feb 2020 14:29:32 +0000 Subject: [PATCH 1/2] (IAC-215) - Implement use_litmus:true --- .sync.yml | 113 ++++-------------------------------------------------- 1 file changed, 8 insertions(+), 105 deletions(-) diff --git a/.sync.yml b/.sync.yml index d25ca61..4cb1b6b 100644 --- a/.sync.yml +++ b/.sync.yml @@ -8,111 +8,14 @@ enabled: false branches: - release - includes: - - bundler_args: - dist: trusty - env: PLATFORMS=deb_puppet5 - rvm: 2.5.1 - before_script: - - bundle exec rake 'litmus:provision_list[travis_deb]' - - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*' - - bundle exec rake 'litmus:install_agent[puppet5]' - - bundle exec rake litmus:install_module - script: - - bundle exec rake litmus:acceptance:parallel - services: docker - sudo: required - stage: acceptance - - bundler_args: - dist: trusty - env: PLATFORMS=deb_puppet6 - rvm: 2.5.1 - before_script: - - bundle exec rake 'litmus:provision_list[travis_deb]' - - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*' - - bundle exec rake 'litmus:install_agent[puppet6]' - - bundle exec rake litmus:install_module - script: - - bundle exec rake litmus:acceptance:parallel - services: docker - - bundler_args: - dist: trusty - env: PLATFORMS=ub_puppet5 - rvm: 2.5.1 - before_script: - - bundle exec rake 'litmus:provision_list[travis_ub]' - - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*' - - bundle exec rake 'litmus:install_agent[puppet5]' - - bundle exec rake litmus:install_module - script: - - bundle exec rake litmus:acceptance:parallel - services: docker - sudo: required - stage: acceptance - - bundler_args: - dist: trusty - env: PLATFORMS=ub_puppet6 - rvm: 2.5.1 - before_script: - - bundle exec rake 'litmus:provision_list[travis_ub]' - - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*' - - bundle exec rake 'litmus:install_agent[puppet6]' - - bundle exec rake litmus:install_module - script: - - bundle exec rake litmus:acceptance:parallel - services: docker - - bundler_args: - dist: trusty - env: PLATFORMS=el6_puppet5 - rvm: 2.5.1 - before_script: - - bundle exec rake 'litmus:provision_list[travis_el6]' - - bundle exec rake 'litmus:install_agent[puppet5]' - - bundle exec rake litmus:install_module - script: - - bundle exec rake litmus:acceptance:parallel - services: docker - sudo: required - stage: acceptance - - bundler_args: - dist: trusty - env: PLATFORMS=el6_puppet6 - rvm: 2.5.1 - before_script: - - bundle exec rake 'litmus:provision_list[travis_el6]' - - bundle exec rake 'litmus:install_agent[puppet6]' - - bundle exec rake litmus:install_module - script: - - bundle exec rake litmus:acceptance:parallel - services: docker - sudo: required - stage: acceptance - - bundler_args: - dist: trusty - env: PLATFORMS=el7_puppet5 - rvm: 2.5.1 - before_script: - - bundle exec rake 'litmus:provision_list[travis_el7]' - - bundle exec rake 'litmus:install_agent[puppet5]' - - bundle exec rake litmus:install_module - script: - - bundle exec rake litmus:acceptance:parallel - services: docker - sudo: required - stage: acceptance - - bundler_args: - dist: trusty - env: PLATFORMS=el7_puppet6 - rvm: 2.5.1 - before_script: - - bundle exec rake 'litmus:provision_list[travis_el7]' - - bundle exec rake 'litmus:install_agent[puppet6]' - - bundle exec rake litmus:install_module - script: - - bundle exec rake litmus:acceptance:parallel - services: docker - sudo: required - stage: acceptance + use_litmus: true + litmus: + provision_list: + - travis_deb + - travis_ub + - travis_el6 + - travis_el7 + - ---travis_el simplecov: true notifications: slack: From 2e72a1e255dbdbf0a28ec0cf6680fedc35f7f6cf Mon Sep 17 00:00:00 2001 From: David Swan Date: Fri, 14 Feb 2020 14:37:07 +0000 Subject: [PATCH 2/2] (IAC-215) - Pdk Update --- .travis.yml | 175 ++++++++++++++++++++++++++++---------------------- metadata.json | 2 +- 2 files changed, 99 insertions(+), 78 deletions(-) diff --git a/.travis.yml b/.travis.yml index f84e573..2774642 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ --- +os: linux dist: xenial language: ruby cache: bundler @@ -23,9 +24,105 @@ stages: - static - spec - acceptance -matrix: +jobs: fast_finish: true include: + - + 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.3 + script: ["bundle exec rake litmus:acceptance:parallel"] + services: docker + stage: acceptance + - + before_script: + - "bundle exec rake 'litmus:provision_list[travis_ub]'" + - "bundle exec rake 'litmus:install_agent[puppet5]'" + - "bundle exec rake litmus:install_module" + bundler_args: + dist: trusty + env: PLATFORMS=travis_ub_puppet5 + rvm: 2.5.3 + script: ["bundle exec rake litmus:acceptance:parallel"] + services: docker + stage: acceptance + - + before_script: + - "bundle exec rake 'litmus:provision_list[travis_el6]'" + - "bundle exec rake 'litmus:install_agent[puppet5]'" + - "bundle exec rake litmus:install_module" + bundler_args: + dist: trusty + env: PLATFORMS=travis_el6_puppet5 + rvm: 2.5.3 + script: ["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.3 + script: ["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.3 + script: ["bundle exec rake litmus:acceptance:parallel"] + services: docker + stage: acceptance + - + before_script: + - "bundle exec rake 'litmus:provision_list[travis_ub]'" + - "bundle exec rake 'litmus:install_agent[puppet6]'" + - "bundle exec rake litmus:install_module" + bundler_args: + dist: trusty + env: PLATFORMS=travis_ub_puppet6 + rvm: 2.5.3 + script: ["bundle exec rake litmus:acceptance:parallel"] + services: docker + stage: acceptance + - + before_script: + - "bundle exec rake 'litmus:provision_list[travis_el6]'" + - "bundle exec rake 'litmus:install_agent[puppet6]'" + - "bundle exec rake litmus:install_module" + bundler_args: + dist: trusty + env: PLATFORMS=travis_el6_puppet6 + rvm: 2.5.3 + script: ["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.3 + script: ["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 @@ -37,82 +134,6 @@ matrix: env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec rvm: 2.5.3 stage: spec - - - before_script: ["bundle exec rake 'litmus:provision_list[travis_deb]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"] - bundler_args: - dist: trusty - env: PLATFORMS=deb_puppet5 - rvm: 2.5.1 - script: ["bundle exec rake litmus:acceptance:parallel"] - services: docker - stage: acceptance - sudo: required - - - before_script: ["bundle exec rake 'litmus:provision_list[travis_deb]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"] - bundler_args: - dist: trusty - env: PLATFORMS=deb_puppet6 - rvm: 2.5.1 - script: ["bundle exec rake litmus:acceptance:parallel"] - services: docker - - - before_script: ["bundle exec rake 'litmus:provision_list[travis_ub]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"] - bundler_args: - dist: trusty - env: PLATFORMS=ub_puppet5 - rvm: 2.5.1 - script: ["bundle exec rake litmus:acceptance:parallel"] - services: docker - stage: acceptance - sudo: required - - - before_script: ["bundle exec rake 'litmus:provision_list[travis_ub]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"] - bundler_args: - dist: trusty - env: PLATFORMS=ub_puppet6 - rvm: 2.5.1 - script: ["bundle exec rake litmus:acceptance:parallel"] - services: docker - - - before_script: ["bundle exec rake 'litmus:provision_list[travis_el6]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"] - bundler_args: - dist: trusty - env: PLATFORMS=el6_puppet5 - rvm: 2.5.1 - script: ["bundle exec rake litmus:acceptance:parallel"] - services: docker - stage: acceptance - sudo: required - - - before_script: ["bundle exec rake 'litmus:provision_list[travis_el6]'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"] - bundler_args: - dist: trusty - env: PLATFORMS=el6_puppet6 - rvm: 2.5.1 - script: ["bundle exec rake litmus:acceptance:parallel"] - services: docker - stage: acceptance - sudo: required - - - 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=el7_puppet5 - rvm: 2.5.1 - script: ["bundle exec rake litmus:acceptance:parallel"] - services: docker - stage: acceptance - sudo: required - - - 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=el7_puppet6 - rvm: 2.5.1 - script: ["bundle exec rake litmus:acceptance:parallel"] - services: docker - stage: acceptance - sudo: required branches: only: - master diff --git a/metadata.json b/metadata.json index 09fd90a..8b06d86 100644 --- a/metadata.json +++ b/metadata.json @@ -81,6 +81,6 @@ } ], "template-url": "https://github.com/puppetlabs/pdk-templates#master", - "template-ref": "heads/master-0-g5d52853", + "template-ref": "heads/master-0-g88c96ab", "pdk-version": "1.16.0" }