Add Fedora 31, drop Fedora 26

.sync.yml

@@ -4,6 +4,7 @@
     - centos6-64
     - debian9-64
     - debian10-64
+    - fedora31-64
     - ubuntu1804-64
   env:
     global:

.travis.yml

@@ -67,6 +67,28 @@ matrix:
         - echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
         - sudo service docker restart
 
+    - rvm: 2.5.1
+      env:
+        - BEAKER_PUPPET_COLLECTION=puppet5
+        - BEAKER_setfile=fedora31-64{hostname=fedora31-64.example.com}
+      script: bundle exec rake beaker
+      services: docker
+      bundler_args: --without development
+      before_install:
+        - echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
+        - sudo service docker restart
+
+    - rvm: 2.5.1
+      env:
+        - BEAKER_PUPPET_COLLECTION=puppet6
+        - BEAKER_setfile=fedora31-64{hostname=fedora31-64.example.com}
+      script: bundle exec rake beaker
+      services: docker
+      bundler_args: --without development
+      before_install:
+        - echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
+        - sudo service docker restart
+
     - rvm: 2.5.1
       env:
         - BEAKER_PUPPET_COLLECTION=puppet5

metadata.json

@@ -65,7 +65,7 @@
     {
       "operatingsystem": "Fedora",
       "operatingsystemrelease": [
-        "26"
+        "31"
       ]
     },
     {

spec/acceptance/puppet_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper_acceptance'
+
+describe 'Scenario: install puppet' do
+  before(:context) do
+    on default, puppet('resource', 'service', 'puppet', 'ensure=stopped', 'enable=false')
+  end
+
+  let(:pp) { 'include puppet' }
+
+  it_behaves_like 'a idempotent resource'
+
+  describe service('puppet') do
+    it { is_expected.to be_running }
+    it { is_expected.to be_enabled }
+  end
+end

spec/acceptance/puppetserver_config_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'Puppetserver config options' do
+describe 'Puppetserver config options', unless: unsupported_puppetserver do
   before(:context) do
     if check_for_package(default, 'puppetserver')
       on default, puppet('resource package puppetserver ensure=purged')

spec/acceptance/puppetserver_latest_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'Scenario: install puppetserver (latest):' do
+describe 'Scenario: install puppetserver (latest):', unless: unsupported_puppetserver do
   before(:context) do
     if check_for_package(default, 'puppetserver')
       on default, puppet('resource package puppetserver ensure=purged')

spec/acceptance/puppetserver_upgrade_5_3_6_to_5_3_7_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'Scenario: 5.3.6 to 5.3.7 upgrade:', if: ENV['BEAKER_PUPPET_COLLECTION'] == 'puppet5' do
+describe 'Scenario: 5.3.6 to 5.3.7 upgrade:', if: ENV['BEAKER_PUPPET_COLLECTION'] == 'puppet5', unless: unsupported_puppetserver do
   before(:context) do
     if check_for_package(default, 'puppetserver')
       on default, puppet('resource package puppetserver ensure=purged')

spec/acceptance/puppetserver_upgrade_6_7_0_to_6_7_2_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'Scenario: 6.7.0 to 6.7.2 upgrade:', if: ENV['BEAKER_PUPPET_COLLECTION'] == 'puppet6' do
+describe 'Scenario: 6.7.0 to 6.7.2 upgrade:', if: ENV['BEAKER_PUPPET_COLLECTION'] == 'puppet6', unless: unsupported_puppetserver do
   before(:context) do
     if check_for_package(default, 'puppetserver')
       on default, puppet('resource package puppetserver ensure=purged')

spec/setup_acceptance_node.pp

@@ -1,5 +1,9 @@
-if $facts['os']['name'] == 'Ubuntu' {
-  package { 'cron':
-    ensure => installed,
-  }
+$packages = $facts['os']['name'] ? {
+  'Fedora' => ['cronie'],
+  'Ubuntu' => ['cron'],
+  default  => [],
+}
+
+package { $packages:
+  ensure => installed,
 }

spec/support/acceptance/puppetserver.rb

@@ -0,0 +1,3 @@
+def unsupported_puppetserver
+  host_inventory['facter']['os']['name'] == 'Fedora'
+end