From 3184d6703911e16fc1801a64cd5dec2d1d0e9dbf Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Tue, 11 Jun 2019 13:44:37 +0300
Subject: [PATCH] update provisioner to docker_exp

added oraclelinux6 to provision.yaml
---
 .travis.yml    | 45 +++++++++------------------------------------
 provision.yaml |  7 +++++--
 2 files changed, 14 insertions(+), 38 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f95a6a43d..82260b70a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,6 @@ matrix:
       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:
@@ -39,7 +38,6 @@ matrix:
       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:
@@ -75,55 +73,30 @@ matrix:
     -
       bundler_args:
       dist: trusty
-      env: PLATFORM=centos6_puppet5
-      rvm: 2.5.1
-      before_script:
-      - bundle exec rake 'litmus:provision[docker, waffleimage/centos6]'
-      - bundle exec rake 'litmus:install_agent[puppet5]'
-      - bundle exec rake litmus:install_module
-      script:
-      - TARGET_HOST=localhost:2222 bundle exec rspec ./spec/acceptance/
-      services: docker
-      sudo: required
-    -
-      bundler_args:
-      dist: trusty
-      env: PLATFORM=centos6_puppet6
-      rvm: 2.5.1
-      before_script:
-      - bundle exec rake 'litmus:provision[docker, waffleimage/centos6]'
-      - bundle exec rake 'litmus:install_agent[puppet6]'
-      - bundle exec rake litmus:install_module
-      script:
-      - TARGET_HOST=localhost:2222 bundle exec rspec ./spec/acceptance/
-      services: docker
-      sudo: required
-    -
-      bundler_args:
-      dist: trusty
-      env: PLATFORM=scientificlinux6_puppet5
-      rvm: 2.5.1
+      env: PLATFORMS=el6_puppet5
+      rvm: 2.5.3
       before_script:
-      - bundle exec rake 'litmus:provision[docker, waffleimage/scientificlinux6]'
+      - bundle exec rake 'litmus:provision_list[travis_el6]'
       - bundle exec rake 'litmus:install_agent[puppet5]'
       - bundle exec rake litmus:install_module
       script:
-      - TARGET_HOST=localhost:2222 bundle exec rspec ./spec/acceptance/
+      - bundle exec rake litmus:acceptance:parallel
       services: docker
       sudo: required
     -
       bundler_args:
       dist: trusty
-      env: PLATFORM=scientificlinux6_puppet6
-      rvm: 2.5.1
+      env: PLATFORMS=el6_puppet6
+      rvm: 2.5.3
       before_script:
-      - bundle exec rake 'litmus:provision[docker, waffleimage/scientificlinux6]'
+      - bundle exec rake 'litmus:provision_list[travis_el6]'
       - bundle exec rake 'litmus:install_agent[puppet6]'
       - bundle exec rake litmus:install_module
       script:
-      - TARGET_HOST=localhost:2222 bundle exec rspec ./spec/acceptance/
+      - bundle exec rake litmus:acceptance:parallel
       services: docker
       sudo: required
+
     -
       env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
     -
diff --git a/provision.yaml b/provision.yaml
index 7df71df3e..dee550856 100644
--- a/provision.yaml
+++ b/provision.yaml
@@ -1,12 +1,15 @@
 ---
 default:
-  provisioner: docker
+  provisioner: docker_exp
   images: ['waffleimage/centos7']
 travis_deb:
   provisioner: docker
   images: ['waffleimage/debian8', 'waffleimage/debian9', 'waffleimage/ubuntu14.04', 'waffleimage/ubuntu16.04', 'waffleimage/ubuntu18.04']
+travis_el6:
+  provisioner: docker_exp
+  images: ['waffleimage/centos6', 'waffleimage/scientificlinux6']
 travis_el7:
-  provisioner: docker
+  provisioner: docker_exp
   images: ['waffleimage/centos7', 'waffleimage/oraclelinux7', 'waffleimage/scientificlinux7']
 release_checks:
   provisioner: vmpooler