Merge pull request #373 from carabasdaniel/master

Fix failing acceptance tests

.travis.yml

@@ -54,10 +54,10 @@ matrix:
     -
       bundler_args:
       dist: trusty
-      env: PLATFORMS=ubuntu_puppet5
+      env: PLATFORMS=ubuntu16_puppet5
       rvm: 2.5.3
       before_script:
-      - bundle exec rake 'litmus:provision_list[travis_ubuntu]'
+      - bundle exec rake 'litmus:provision_list[travis_ubuntu16]'
       - bundle exec rake 'litmus:install_agent[puppet5]'
       - bundle exec rake litmus:install_module
       script:
@@ -68,10 +68,38 @@ matrix:
     -
       bundler_args:
       dist: trusty
-      env: PLATFORMS=ubuntu_puppet6
+      env: PLATFORMS=ubuntu18_puppet5
       rvm: 2.5.3
       before_script:
-      - bundle exec rake 'litmus:provision_list[travis_ubuntu]'
+      - bundle exec rake 'litmus:provision_list[travis_ubuntu18]'
+      - 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=ubuntu16_puppet6
+      rvm: 2.5.3
+      before_script:
+      - bundle exec rake 'litmus:provision_list[travis_ubuntu16]'
+      - 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=ubuntu18_puppet6
+      rvm: 2.5.3
+      before_script:
+      - bundle exec rake 'litmus:provision_list[travis_ubuntu18]'
       - bundle exec rake 'litmus:install_agent[puppet6]'
       - bundle exec rake litmus:install_module
       script:

metadata.json

@@ -65,7 +65,6 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "14.04",
         "16.04",
         "18.04"
       ]

provision.yaml

@@ -2,9 +2,12 @@
 default:
   provisioner: docker
   images: ['waffleimage/centos7']
-travis_ubuntu:
+travis_ubuntu16:
   provisioner: docker
-  images: ['waffleimage/ubuntu14.04','waffleimage/ubuntu16.04','waffleimage/ubuntu18.04']
+  images: ['waffleimage/ubuntu16.04']
+travis_ubuntu18:
+  provisioner: docker
+  images: ['waffleimage/ubuntu18.04']
 travis_debian:
   provisioner: docker
   images: ['waffleimage/debian8', 'waffleimage/debian9']
@@ -19,4 +22,4 @@ vagrant:
   images: ['centos/7', 'generic/ubuntu1804']
 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', 'oracle-6-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64', 'debian-10-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64']
+  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', 'oracle-6-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64', 'debian-10-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64']

spec/spec_helper_acceptance_local.rb

@@ -36,9 +36,11 @@ class { 'epel': }
       run_shell('yum install -y crontabs tar wget openssl iproute which initscripts nss')
     elsif os[:family] == 'ubuntu'
       run_shell('rm /usr/sbin/policy-rc.d && rm /sbin/initctl && dpkg-divert --rename --remove /sbin/initctl', expect_failures: true)
-      run_shell('apt-get update && apt-get install -y net-tools wget && locale-gen en_US.UTF-8', expect_failures: true)
+      run_shell('apt-get update', expect_failures: true)
+      run_shell('DEBIAN_FRONTEND=noninteractive apt-get install -y net-tools curl wget', expect_failures: true)
+      run_shell('locale-gen en_US.UTF-8', expect_failures: true)
     elsif os[:family] == 'debian'
-      run_shell('apt-get update && apt-get install -y net-tools wget locales strace lsof && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen', expect_failures: true)
+      run_shell('apt-get update && apt-get install -y net-tools curl wget locales strace lsof && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen', expect_failures: true)
     end
   end
 end