Merge pull request #1591 from bastelfreak/tests6

ekohl · web-flow · commit 93bf0b55c66f · 2024-07-31T12:00:51.000+02:00
Add EL9 support
diff --git a/metadata.json b/metadata.json
@@ -38,13 +38,15 @@
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "7",
-        "8"
+        "8",
+        "9"
       ]
     },
     {
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
-        "7"
+        "7",
+        "9"
       ]
     },
     {
@@ -79,13 +81,15 @@
     {
       "operatingsystem": "Rocky",
       "operatingsystemrelease": [
-        "8"
+        "8",
+        "9"
       ]
     },
     {
       "operatingsystem": "AlmaLinux",
       "operatingsystemrelease": [
-        "8"
+        "8",
+        "9"
       ]
     }
   ],
diff --git a/spec/acceptance/server_instance_spec.rb b/spec/acceptance/server_instance_spec.rb
@@ -3,7 +3,7 @@
 # run a test task
 require 'spec_helper_acceptance'
 
-describe 'postgresql instance test1', if: os[:family] == 'redhat' && os[:release].start_with?('8') do
+describe 'postgresql instance test1', if: os[:family] == 'redhat' && !os[:release].start_with?('7') do
   pp = <<-MANIFEST
   # set global defaults
   class { 'postgresql::globals':
@@ -12,7 +12,7 @@ class { 'postgresql::globals':
     manage_package_repo => false,
     manage_dnf_module   => true,
     needs_initdb        => true,
-    version             => '13',
+    version             => '16',
   }
   # stop default main instance
   class { 'postgresql::server':

Original file line number	Diff line number	Diff line change
`@@ -38,13 +38,15 @@`
`38`	`38`	`"operatingsystem": "CentOS",`
`39`	`39`	`"operatingsystemrelease": [`
`40`	`40`	`"7",`
`41`		`- "8"`
	`41`	`+ "8",`
	`42`	`+ "9"`
`42`	`43`	`]`
`43`	`44`	`},`
`44`	`45`	`{`
`45`	`46`	`"operatingsystem": "OracleLinux",`
`46`	`47`	`"operatingsystemrelease": [`
`47`		`- "7"`
	`48`	`+ "7",`
	`49`	`+ "9"`
`48`	`50`	`]`
`49`	`51`	`},`
`50`	`52`	`{`
`@@ -79,13 +81,15 @@`
`79`	`81`	`{`
`80`	`82`	`"operatingsystem": "Rocky",`
`81`	`83`	`"operatingsystemrelease": [`
`82`		`- "8"`
	`84`	`+ "8",`
	`85`	`+ "9"`
`83`	`86`	`]`
`84`	`87`	`},`
`85`	`88`	`{`
`86`	`89`	`"operatingsystem": "AlmaLinux",`
`87`	`90`	`"operatingsystemrelease": [`
`88`		`- "8"`
	`91`	`+ "8",`
	`92`	`+ "9"`
`89`	`93`	`]`
`90`	`94`	`}`
`91`	`95`	`],`