From a85a9fa86d1960544b45dd5d5140e3b1a31e6a96 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.co.uk>
Date: Mon, 17 Feb 2020 09:30:10 +0000
Subject: [PATCH] (IAC-215) - Pdk Update
---
.travis.yml | 73 +++++++++++++++++++++++++++++++++------------------
metadata.json | 2 +-
2 files changed, 49 insertions(+), 26 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 46e3830..661f046 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
---
+os: linux
dist: xenial
language: ruby
cache: bundler
@@ -23,70 +24,92 @@ stages:
- static
- spec
- acceptance
-matrix:
+jobs:
fast_finish: true
include:
-
- 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
+ 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
- stage: spec
+ 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"]
+ 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: PLATFORM=el7_puppet6
+ env: PLATFORMS=travis_ub_puppet5
rvm: 2.5.3
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='*'", "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:install_agent[puppet5]'"
+ - "bundle exec rake litmus:install_module"
bundler_args:
dist: trusty
- env: PLATFORMS=deb_puppet6
+ env: PLATFORMS=travis_el7_puppet5
rvm: 2.5.3
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='*'", "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"
bundler_args:
dist: trusty
- env: PLATFORMS=deb_puppet5
+ env: PLATFORMS=travis_deb_puppet6
rvm: 2.5.3
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='*'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
+ 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=ub_puppet6
+ env: PLATFORMS=travis_ub_puppet6
rvm: 2.5.3
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='*'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
+ 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=ub_puppet5
+ env: PLATFORMS=travis_el7_puppet6
rvm: 2.5.3
script: ["bundle exec rake litmus:acceptance:parallel"]
services: docker
stage: acceptance
- sudo: required
+ -
+ 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.3
+ stage: spec
branches:
only:
- master
diff --git a/metadata.json b/metadata.json
index b4f1661..20aaf7d 100644
--- a/metadata.json
+++ b/metadata.json
@@ -78,6 +78,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"
}
--
2.45.2