Merge pull request #430 from yakatz/versions

bastelfreak · web-flow · commit c94ddb5fd030 · 2024-02-14T09:43:35.000+01:00
Add EL9, Debian 12, Ubuntu 22.04 support
diff --git a/metadata.json b/metadata.json
@@ -26,7 +26,8 @@
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "7",
-        "8"
+        "8",
+        "9"
       ]
     },
     {
@@ -40,7 +41,15 @@
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
         "7",
-        "8"
+        "8",
+        "9"
+      ]
+    },
+    {
+      "operatingsystem": "Rocky",
+      "operatingsystemrelease": [
+        "8",
+        "9"
       ]
     },
     {
@@ -53,14 +62,16 @@
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
         "10",
-        "11"
+        "11",
+        "12"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "18.04",
-        "20.04"
+        "20.04",
+        "22.04"
       ]
     }
   ],
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -24,5 +24,5 @@
     }
   )
 
-  apply_manifest_on(host, tzdata, catch_failures: true) if fact('os.release.major') =~ %r{(16.04|18.04)}
+  apply_manifest_on(host, tzdata, catch_failures: true)
 end

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,8 @@`
`26`	`26`	`"operatingsystem": "RedHat",`
`27`	`27`	`"operatingsystemrelease": [`
`28`	`28`	`"7",`
`29`		`- "8"`
	`29`	`+ "8",`
	`30`	`+ "9"`
`30`	`31`	`]`
`31`	`32`	`},`
`32`	`33`	`{`
`@@ -40,7 +41,15 @@`
`40`	`41`	`"operatingsystem": "OracleLinux",`
`41`	`42`	`"operatingsystemrelease": [`
`42`	`43`	`"7",`
`43`		`- "8"`
	`44`	`+ "8",`
	`45`	`+ "9"`
	`46`	`+ ]`
	`47`	`+ },`
	`48`	`+ {`
	`49`	`+ "operatingsystem": "Rocky",`
	`50`	`+ "operatingsystemrelease": [`
	`51`	`+ "8",`
	`52`	`+ "9"`
`44`	`53`	`]`
`45`	`54`	`},`
`46`	`55`	`{`
`@@ -53,14 +62,16 @@`
`53`	`62`	`"operatingsystem": "Debian",`
`54`	`63`	`"operatingsystemrelease": [`
`55`	`64`	`"10",`
`56`		`- "11"`
	`65`	`+ "11",`
	`66`	`+ "12"`
`57`	`67`	`]`
`58`	`68`	`},`
`59`	`69`	`{`
`60`	`70`	`"operatingsystem": "Ubuntu",`
`61`	`71`	`"operatingsystemrelease": [`
`62`	`72`	`"18.04",`
`63`		`- "20.04"`
	`73`	`+ "20.04",`
	`74`	`+ "22.04"`
`64`	`75`	`]`
`65`	`76`	`}`
`66`	`77`	`],`
Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,5 @@`
`24`	`24`	`}`
`25`	`25`	`)`
`26`	`26`
`27`		`- apply_manifest_on(host, tzdata, catch_failures: true) if fact('os.release.major') =~ %r{(16.04\|18.04)}`
	`27`	`+ apply_manifest_on(host, tzdata, catch_failures: true)`
`28`	`28`	`end`