remove EOL OSes, add new ones (#387)

theforeman · Oct 29, 2017 · 1001ad0 · 1001ad0
1 parent 9041338
commit 1001ad0
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 21 deletions.
diff --git a/metadata.json b/metadata.json
@@ -61,48 +61,39 @@
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "6",
         "7"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "6",
         "7"
       ]
     },
     {
       "operatingsystem": "Scientific",
       "operatingsystemrelease": [
-        "6",
         "7"
       ]
     },
-    {
-      "operatingsystem": "Fedora",
-      "operatingsystemrelease": [
-        "24"
-      ]
-    },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "8"
+        "8",
+        "9"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "14.04",
         "16.04"
       ]
     },
     {
       "operatingsystem": "FreeBSD",
       "operatingsystemrelease": [
-        "9",
-        "10"
+        "10",
+        "11"
       ]
     },
     {
@@ -111,8 +102,6 @@
     {
       "operatingsystem": "DragonFly",
       "operatingsystemrelease": [
-        "3.6",
-        "3.8",
         "4"
       ]
     }

diff --git a/spec/classes/foreman_proxy__plugin__abrt_spec.rb b/spec/classes/foreman_proxy__plugin__abrt_spec.rb
@@ -3,7 +3,7 @@
 describe 'foreman_proxy::plugin::abrt' do
 
   let :facts do
-    on_supported_os['redhat-6-x86_64']
+    on_supported_os['redhat-7-x86_64']
   end
 
   describe 'with default settings' do

diff --git a/spec/classes/foreman_proxy__plugin__chef__spec.rb b/spec/classes/foreman_proxy__plugin__chef__spec.rb
@@ -2,7 +2,7 @@
 
 describe 'foreman_proxy::plugin::chef' do
   let :facts do
-    on_supported_os['redhat-6-x86_64']
+    on_supported_os['redhat-7-x86_64']
   end
 
   let :pre_condition do

diff --git a/spec/classes/foreman_proxy__plugin__monitoring_spec.rb b/spec/classes/foreman_proxy__plugin__monitoring_spec.rb
@@ -3,7 +3,7 @@
 describe 'foreman_proxy::plugin::monitoring' do
 
   let :facts do
-    on_supported_os['redhat-6-x86_64']
+    on_supported_os['redhat-7-x86_64']
   end
 
   describe 'with default settings' do

diff --git a/spec/classes/foreman_proxy__plugin__openscap_spec.rb b/spec/classes/foreman_proxy__plugin__openscap_spec.rb
@@ -2,7 +2,7 @@
 
 describe 'foreman_proxy::plugin::openscap' do
   let :facts do
-    on_supported_os['redhat-6-x86_64']
+    on_supported_os['redhat-7-x86_64']
   end
 
   let :pre_condition do

diff --git a/spec/classes/foreman_proxy__plugin__pulp_spec.rb b/spec/classes/foreman_proxy__plugin__pulp_spec.rb
@@ -8,7 +8,7 @@
   end
 
   let :facts do
-    on_supported_os['redhat-6-x86_64'].merge(:puppet_environmentpath => puppet_environmentpath)
+    on_supported_os['redhat-7-x86_64'].merge(:puppet_environmentpath => puppet_environmentpath)
   end
 
   let :etc_dir do

diff --git a/spec/classes/foreman_proxy__plugin__salt_spec.rb b/spec/classes/foreman_proxy__plugin__salt_spec.rb
@@ -3,7 +3,7 @@
 describe 'foreman_proxy::plugin::salt' do
 
   let :facts do
-    on_supported_os['redhat-6-x86_64']
+    on_supported_os['redhat-7-x86_64']
   end
 
   describe 'with default settings' do