(MODULES-11192)(MODULES-11168) Add AlmaLinux and Rocky to the

BobosilaVictor · BobosilaVictor · commit 8b23e952fa52 · 2021-09-29T13:34:28.000+03:00
puppet-agent module
diff --git a/metadata.json b/metadata.json
@@ -115,6 +115,18 @@
         "10.15",
         "11"
        ]
+    },
+    {
+      "operatingsystem": "AlmaLinux",
+      "operatingsystemrelease": [
+        "8"
+      ]
+    },
+    {
+      "operatingsystem": "Rocky",
+      "operatingsystemrelease": [
+        "8"
+      ]
     }
   ],
   "requirements": [
diff --git a/spec/classes/puppet_agent_osfamily_redhat_spec.rb b/spec/classes/puppet_agent_osfamily_redhat_spec.rb
@@ -19,7 +19,7 @@
     }
   end
 
-  [['Fedora', 'fedora/f34', 34], ['CentOS', 'el/7', 7], ['Amazon', 'el/6', 2017], ['Amazon', 'el/7', 2]].each do |os, urlbit, osmajor|
+  [['Rocky', 'el/8', 8], ['AlmaLinux', 'el/8', 8], ['Fedora', 'fedora/f34', 34], ['CentOS', 'el/7', 7], ['Amazon', 'el/6', 2017], ['Amazon', 'el/7', 2]].each do |os, urlbit, osmajor|
     context "with #{os} and #{urlbit}" do
       let(:facts) do
         super().merge(:operatingsystem  => os, :operatingsystemmajrelease => osmajor)

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`}`
`20`	`20`	`end`
`21`	`21`
`22`		`- [['Fedora', 'fedora/f34', 34], ['CentOS', 'el/7', 7], ['Amazon', 'el/6', 2017], ['Amazon', 'el/7', 2]].each do \|os, urlbit, osmajor\|`
	`22`	`+ [['Rocky', 'el/8', 8], ['AlmaLinux', 'el/8', 8], ['Fedora', 'fedora/f34', 34], ['CentOS', 'el/7', 7], ['Amazon', 'el/6', 2017], ['Amazon', 'el/7', 2]].each do \|os, urlbit, osmajor\|`
`23`	`23`	`context "with #{os} and #{urlbit}" do`
`24`	`24`	`let(:facts) do`
`25`	`25`	`super().merge(:operatingsystem => os, :operatingsystemmajrelease => osmajor)`