From a145af45ab55be18379d5c0d610d252eea5aa5bc Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.co.uk>
Date: Fri, 10 Jan 2020 15:58:28 +0000
Subject: [PATCH] (FM-8581) - Debian 10 added to travis and provision file
 refactored

---
 .sync.yml      | 28 ++++++++++++++++++++++++++++
 .travis.yml    | 20 ++++++++++++++++++++
 provision.yaml | 20 +++++++++++++-------
 3 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/.sync.yml b/.sync.yml
index 92c3f78..bd63a67 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -41,6 +41,34 @@
     services: docker
     sudo: required
     stage: acceptance
+  - bundler_args: 
+    dist: trusty
+    env: PLATFORMS=ub_puppet5
+    rvm: 2.5.3
+    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
+    stage: acceptance
+    sudo: required
+  - bundler_args: 
+    dist: trusty
+    env: PLATFORM=ub_puppet6
+    rvm: 2.5.3
+    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
+    sudo: required
+    stage: acceptance
   simplecov: true
   notifications:
     slack:
diff --git a/.travis.yml b/.travis.yml
index 0399abc..a1db314 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,6 +53,26 @@ matrix:
       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[puppet5]'", "bundle exec rake litmus:install_module"]
+      bundler_args: 
+      dist: trusty
+      env: PLATFORMS=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_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: PLATFORM=ub_puppet6
+      rvm: 2.5.3
+      script: ["bundle exec rake litmus:acceptance:parallel"]
+      services: docker
+      stage: acceptance
+      sudo: required
 branches:
   only:
     - master
diff --git a/provision.yaml b/provision.yaml
index fadfe69..28d160b 100644
--- a/provision.yaml
+++ b/provision.yaml
@@ -2,15 +2,21 @@
 default:
   provisioner: docker 
   images: ['waffleimage/debian8']
-travis_deb:
-  provisioner: docker
-  images: ['debian:8', 'debian:9', 'ubuntu:16.04', 'ubuntu:18.04']
-waffle_deb:
-  provisioner: docker 
-  images: ['waffleimage/debian8', 'waffleimage/debian9', 'waffleimage/ubuntu14.04', 'waffleimage/ubuntu16.04', 'waffleimage/ubuntu18.04']
 vagrant:
   provisioner: vagrant
-  images: ['centos/7', 'generic/ubuntu1804']
+  images: ['centos/7', 'generic/ubuntu1804'] 
+travis_deb:
+  provisioner: docker 
+  images: ['waffleimage/debian9', 'waffleimage/debian10']
+travis_ub:
+  provisioner: docker 
+  images: ['ubuntu:16.04', 'ubuntu:18.04']
+travis_el6:
+  provisioner: docker 
+  images: []
+travis_el7:
+  provisioner: docker 
+  images: []
 release_checks:
   provisioner: vmpooler
   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']
-- 
2.32.3