(FM-8581) - Debian 10 added to travis and provision file refactored

diff --git a/.sync.yml b/.sync.yml
index d2f97a6dd719afee3dc63c3249b41f9546641657..4ff3516700f71f97899172dd13d87c4f78313b17 100644 (file)
--- a/.sync.yml
+++ b/.sync.yml
@@ -9,10 +9,10 @@
   includes:
   - bundler_args: 
     dist: trusty
-    env: PLATFORM=deb_puppet6
+    env: PLATFORM=el7_puppet6
     rvm: 2.5.3
     before_script:
-    - bundle exec rake 'litmus:provision_list[waffle_el]'
+    - bundle exec rake 'litmus:provision_list[travis_el7]'
     - bundle exec rake 'litmus:install_agent[puppet6]'
     - bundle exec rake litmus:install_module
     script:
@@ -25,7 +25,7 @@
     env: PLATFORMS=deb_puppet6
     rvm: 2.5.3
     before_script:
-    - bundle exec rake 'litmus:provision_list[waffle_deb]'
+    - 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
@@ -39,7 +39,35 @@
     env: PLATFORMS=deb_puppet5
     rvm: 2.5.3
     before_script:
-    - bundle exec rake 'litmus:provision_list[waffle_deb]'
+    - 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
+    script:
+    - bundle exec rake litmus:acceptance:parallel
+    services: docker
+    sudo: required
+    stage: acceptance
+  - bundler_args: 
+    dist: trusty
+    env: PLATFORMS=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='*'
+    - 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=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='*'
     - bundle exec rake 'litmus:install_agent[puppet5]'
     - bundle exec rake litmus:install_module

diff --git a/.travis.yml b/.travis.yml
index 9d616c72605a71657e5a18016417639648f58524..52956a4705fa835ccea8ca17517abfa0a793b2d5 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,17 +34,17 @@ matrix:
       rvm: 2.5.3
       stage: spec
     -
-      before_script: ["bundle exec rake 'litmus:provision_list[waffle_el]'", "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[puppet6]'", "bundle exec rake litmus:install_module"]
       bundler_args: 
       dist: trusty
-      env: PLATFORM=deb_puppet6
+      env: PLATFORM=el7_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[waffle_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_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"]
       bundler_args: 
       dist: trusty
       env: PLATFORMS=deb_puppet6
@@ -54,7 +54,7 @@ matrix:
       stage: acceptance
       sudo: required
     -
-      before_script: ["bundle exec rake 'litmus:provision_list[waffle_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 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"]
       bundler_args: 
       dist: trusty
       env: PLATFORMS=deb_puppet5
@@ -63,6 +63,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='*'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
+      bundler_args: 
+      dist: trusty
+      env: PLATFORMS=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"]
+      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
 branches:
   only:
     - master

diff --git a/provision.yaml b/provision.yaml
index 2a974e2f928ad59d40da581fc7b714f6452fe3c6..b076d5dd13a2d7f7dd7182d8ac6c573d411b31cc 100644 (file)
--- a/provision.yaml
+++ b/provision.yaml
@@ -2,15 +2,21 @@
 default:
   provisioner: docker
   images: ['waffleimage/centos7']
-waffle_deb:
-  provisioner: docker_exp
-  images: ['waffleimage/debian8', 'waffleimage/debian9', 'waffleimage/ubuntu14.04', 'waffleimage/ubuntu16.04', 'waffleimage/ubuntu18.04']
-waffle_el:
-  provisioner: docker
-  images: ['waffleimage/centos7']
 vagrant:
   provisioner: vagrant
   images: ['centos/7', 'generic/ubuntu1804']
+travis_deb:
+  provisioner: docker
+  images: ['waffleimage/debian8', 'waffleimage/debian9'] # 'waffleimage/debian10' removed due to failures present only on Docker
+travis_ub:
+  provisioner: docker
+  images: ['waffleimage/ubuntu14.04', 'waffleimage/ubuntu16.04', 'waffleimage/ubuntu18.04']
+travis_el6:
+  provisioner: docker
+  images: []
+travis_el7:
+  provisioner: docker
+  images: ['waffleimage/centos7']
 release_checks:
   provisioner: vmpooler
   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-11-x86_64', 'sles-12-x86_64', 'sles-15-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64']