(PIE-1595) Update supported OS in metadata

puppetlabs · Oct 21, 2024 · 7d66010 · 7d66010
1 parent 133760f
commit 7d66010
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 15 deletions.
diff --git a/.github/workflows/nightly_testing.yml b/.github/workflows/nightly_testing.yml
@@ -30,7 +30,8 @@ jobs:
     - name: Get Test Matrix
       id: get-matrix
       run: |
-        bundle exec matrix_from_metadata_v3 --output stdout | jq
+        bundle exec matrix_from_metadata_v3 --provision-include provision_service --output stdout
+        bundle exec matrix_from_metadata_v3
     - name: Set nightly releases
       id: nightly_release
       run: |
@@ -39,7 +40,7 @@ jobs:
     - name: Setup Spec Test Matrix
       id: set-matrix
       run: |
-        echo "matrix={\"platforms\":[\"rhel-8\",\"rhel-9\",\"sles-15\",\"ubuntu-2004-lts\"]}" >> $GITHUB_OUTPUT
+        echo "matrix={\"platforms\":[\"rhel-8\",\"rhel-9\",\"sles-15\",\"ubuntu-2204-lts\"]}" >> $GITHUB_OUTPUT
     - name: Setup Acceptance Test Matrix
       id: build-matrix
       run: |

diff --git a/metadata.json b/metadata.json
@@ -19,15 +19,31 @@
   ],
   "operatingsystem_support": [
     {
-      "operatingsystem": "CentOS",
+      "operatingsystem": "AlmaLinux",
       "operatingsystemrelease": [
-        "7"
+        "8",
+        "9"
+      ]
+    },
+    {
+      "operatingsystem": "AmazonLinux",
+      "operatingsystemrelease": [
+        "2"
+      ]
+    },
+    {
+      "operatingsystem": "Debian",
+      "operatingsystemrelease": [
+        "9",
+        "10",
+        "11"
       ]
     },
     {
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
-        "7"
+        "7",
+        "8"
       ]
     },
     {
@@ -39,24 +55,25 @@
       ]
     },
     {
-      "operatingsystem": "Scientific",
+      "operatingsystem": "RockyLinux",
       "operatingsystemrelease": [
-        "7"
+        "8",
+        "9"
       ]
     },
     {
-      "operatingsystem": "Ubuntu",
+      "operatingsystem": "SLES",
       "operatingsystemrelease": [
-        "18.04",
-        "20.04",
-        "22.04"
+        "12",
+        "15"
       ]
     },
     {
-      "operatingsystem": "SLES",
+      "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "12",
-        "15"
+        "18.04",
+        "20.04",
+        "22.04"
       ]
     }
   ],

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -73,4 +73,4 @@ def ensure_module_defined(module_name)
 end
 
 # 'spec_overrides' from sync.yml will appear below this line
-# 
+#