Merge pull request #462 from bastelfreak/ubuntu1804

enable ubuntu 18.04 acceptance tests
voxpupuli · Jul 15, 2018 · 33380f4 · 33380f4
2 parents 77d3449 + da702c6
commit 33380f4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/.sync.yml b/.sync.yml
@@ -13,6 +13,9 @@
     - set: debian7-64
       options:
         script: 'bundle exec rspec spec/acceptance/php56_spec.rb'
+    - set: ubuntu1804-64
+      options:
+        script: 'bundle exec rspec spec/acceptance/php_spec.rb'
     - set: ubuntu1604-64
       options:
         script: 'bundle exec rspec spec/acceptance/php_spec.rb'

diff --git a/.travis.yml b/.travis.yml
@@ -56,6 +56,13 @@ matrix:
     script: bundle exec rspec spec/acceptance/php56_spec.rb
     services: docker
     sudo: required
+  - rvm: 2.5.1
+    bundler_args: --without development release
+    dist: trusty
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1804-64{hypervisor=docker} CHECK=beaker
+    script: bundle exec rspec spec/acceptance/php_spec.rb
+    services: docker
+    sudo: required
   - rvm: 2.5.1
     bundler_args: --without development release
     dist: trusty

diff --git a/spec/acceptance/php_spec.rb b/spec/acceptance/php_spec.rb
@@ -10,6 +10,8 @@
     end
 
     case default[:platform]
+    when %r{ubuntu-18.04}
+      packagename = 'php7.2-fpm'
     when %r{ubuntu-16.04}
       packagename = 'php7.0-fpm'
     when %r{ubuntu-14.04}