Merge pull request #280 from smortex/metadata

Author: smortex

metadata.json

@@ -8,7 +8,7 @@
   "project_page": "https://github.com/choria-io/puppet-choria",
   "issues_url": "https://github.com/choria-io/puppet-choria/issues",
   "dependencies": [
-    { "name": "puppetlabs/stdlib", "version_requirement": ">= 4.24.0 < 8.0.0" },
+    { "name": "puppetlabs/stdlib", "version_requirement": ">= 4.24.0 < 9.0.0" },
     { "name": "puppetlabs/apt", "version_requirement": ">= 4.5.1 < 9.0.0" },
     { "name": "choria/mcollective_choria", "version_requirement": ">= 0.21.2 < 2.0.0" },
     { "name": "choria/mcollective", "version_requirement": ">= 0.13.4 < 2.0.0" },
@@ -20,19 +20,59 @@
   ],
   "operatingsystem_support": [
     {
-      "operatingsystem": "RedHat",
+      "operatingsystem": "AIX",
+      "operatingsystemrelease": [
+        "7.1",
+        "7.2"
+      ]
+    },
+    {
+      "operatingsystem": "AlmaLinux",
       "operatingsystemrelease": [
-        "7",
         "8"
       ]
     },
+    {
+      "operatingsystem": "Archlinux"
+    },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "7",
         "8"
       ]
     },
+    {
+      "operatingsystem": "Darwin",
+      "operatingsystemrelease": [
+        "10.11",
+        "10.12",
+        "10.13"
+      ]
+    },
+    {
+      "operatingsystem": "Debian",
+      "operatingsystemrelease": [
+        "9",
+        "10",
+        "11"
+      ]
+    },
+    {
+      "operatingsystem": "Fedora",
+      "operatingsystemrelease": [
+        "33",
+        "34",
+        "35"
+      ]
+    },
+    {
+      "operatingsystem": "FreeBSD",
+      "operatingsystemrelease": [
+        "12",
+        "13"
+      ]
+    },
     {
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
@@ -41,39 +81,36 @@
       ]
     },
     {
-      "operatingsystem": "Scientific",
+      "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "7",
         "8"
       ]
     },
     {
-      "operatingsystem": "Fedora",
+      "operatingsystem": "RockyLinux",
       "operatingsystemrelease": [
-        "32",
-        "33",
-        "34"
+        "8"
       ]
     },
     {
-      "operatingsystem": "SLES",
+      "operatingsystem": "Scientific",
       "operatingsystemrelease": [
-        "11 SP1",
-        "12"
+        "7",
+        "8"
       ]
     },
     {
-      "operatingsystem": "Debian",
+      "operatingsystem": "SLES",
       "operatingsystemrelease": [
-        "9",
-        "10",
-        "11"
+        "11",
+        "12",
+        "15"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "16.04",
         "18.04",
         "20.04"
       ]
@@ -83,22 +120,18 @@
       "operatingsystemrelease": [
         "Server 2012",
         "Server 2012 R2",
-        "7",
-        "8"
-      ]
-    },
-    {
-      "operatingsystem": "FreeBSD",
-      "operatingsystemrelease": [
-        "11",
-        "12"
+        "Server 2016",
+        "Server 2019",
+        "Server 2022",
+        "8",
+        "10"
       ]
     }
   ],
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 6.0.0"
+      "version_requirement": ">= 6.0.0 < 8.0.0"
     }
   ]
 }

spec/classes/init_spec.rb

@@ -65,7 +65,7 @@
           it { is_expected.to contain_file("/usr/local/etc/choria/machine").with_ensure("directory") }
         end
 
-        if ["FreeBSD", "AIX", "Solaris", "windows", "SLES"].include? facts[:os]["name"]
+        if ["Archlinux", "AIX", "FreeBSD", "SLES", "Solaris", "windows"].include? facts[:os]["name"]
           it { is_expected.not_to contain_class("choria::repo") }
         else
           it { is_expected.to contain_class("choria::repo") }
@@ -86,7 +86,7 @@
             { manage_package_repo: true, manage_mcollective: false }
           end
 
-          if facts[:kernel] == "Linux" and facts[:os]["family"] != "Suse"
+          if facts[:kernel] == "Linux" and ! ["Archlinux", "Suse"].include?(facts[:os]["family"])
             it { is_expected.to contain_class("choria::repo").with_nightly(false) }
             it { is_expected.to contain_class("choria::repo").with_ensure("present") }
           else
@@ -103,7 +103,7 @@
           end
         end
 
-        context "with managed repos", if: (facts[:kernel] == "Linux" and facts[:os]["family"] != "Suse") do
+        context "with managed repos", if: (facts[:kernel] == "Linux" and ! ["Archlinux", "Suse"].include?(facts[:os]["family"])) do
           let(:params) do
             {
               manage_package_repo: true,
@@ -233,7 +233,7 @@
         end
       end
 
-      context "with package set to a specific version" do
+      context "with package set to a specific version", unless: facts[:os]["family"] == "Archlinux" do
         let :params do
           {
             manage_mcollective: false,
@@ -269,8 +269,14 @@
         if facts[:kernel] == "windows"
           it { is_expected.not_to contain_package("choria") }
         else
-          it "should use the correct ensure value" do
-            is_expected.to contain_package("choria").with_ensure("absent")
+          if facts[:os]["family"] == "Archlinux"
+            it "should use the correct ensure value" do
+              is_expected.to contain_package("choria-io").with_ensure("absent")
+            end
+          else
+            it "should use the correct ensure value" do
+              is_expected.to contain_package("choria").with_ensure("absent")
+            end
           end
         end
       end