Add tests for RedHat/CentOS 8

Skip SCL tests since SCL doesn't exist
voxpupuli · Apr 1, 2020 · af7bcb1 · af7bcb1
1 parent ef7c4e6
commit af7bcb1
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/.sync.yml b/.sync.yml
@@ -6,6 +6,7 @@
     - set: ubuntu1804-64m
     - set: centos6-64m
     - set: centos7-64m
+    - set: centos8-64m
     - set: debian9-64m
     - set: debian10-64m
 Gemfile:

diff --git a/.travis.yml b/.travis.yml
@@ -54,6 +54,14 @@ matrix:
     bundler_args: --without development release
     env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=centos7-64m BEAKER_HYPERVISOR=docker CHECK=beaker
     services: docker
+  - rvm: 2.5.3
+    bundler_args: --without development release
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos8-64m BEAKER_HYPERVISOR=docker CHECK=beaker
+    services: docker
+  - rvm: 2.5.3
+    bundler_args: --without development release
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=centos8-64m BEAKER_HYPERVISOR=docker CHECK=beaker
+    services: docker
   - rvm: 2.5.3
     bundler_args: --without development release
     env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian9-64m BEAKER_HYPERVISOR=docker CHECK=beaker

diff --git a/metadata.json b/metadata.json
@@ -62,14 +62,16 @@
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "6",
-        "7"
+        "7",
+        "8"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "6",
-        "7"
+        "7",
+        "8"
       ]
     },
     {

diff --git a/spec/acceptance/suites/scl/redis5_spec.rb b/spec/acceptance/suites/scl/redis5_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'redis', if: %w[centos redhat].include?(os[:family]) && os[:release].to_i >= 7 do
+describe 'redis', if: %w[centos redhat].include?(os[:family]) && os[:release].to_i == 7 do
   before(:all) do
     on hosts, puppet_resource('service', 'redis', 'ensure=stopped', 'enable=false')
   end

diff --git a/spec/classes/redis_spec.rb b/spec/classes/redis_spec.rb
@@ -50,7 +50,7 @@
           )
         end
 
-        context 'with SCL', if: facts[:osfamily] == 'RedHat' do
+        context 'with SCL', if: facts[:osfamily] == 'RedHat' && facts[:operatingsystemmajrelease] < '8' do
           let(:pre_condition) do
             <<-PUPPET
             class { 'redis::globals':