Merge pull request #519 from puppetlabs/pdksync_GH-cat-12/main/add_re…

…dhat_9_support pdksync - (GH-cat-12) Add Support for Redhat 9
puppetlabs · Jun 13, 2022 · 4f3ec08 · 4f3ec08
2 parents f2ab613 + 17fafbc
commit 4f3ec08
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/metadata.json b/metadata.json
@@ -22,7 +22,8 @@
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "7",
-        "8"
+        "8",
+        "9"
       ]
     },
     {

diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
@@ -42,7 +42,11 @@ def retry_on_error_matching(max_retry_count = MAX_RETRY_COUNT, retry_wait_interv
     LitmusHelper.instance.run_shell('setenforce 0', expect_failures: true) if os[:family].match?(%r{redhat|oracle})
 
     if os[:family] == 'redhat' && os[:release].to_i != 8
-      LitmusHelper.instance.run_shell('puppet module install stahnma/epel')
+      epel_owner = 'puppet'
+      if os[:release].to_i == 6
+        epel_owner = 'stahnma'
+      end
+      LitmusHelper.instance.run_shell("puppet module install #{epel_owner}/epel")
       if os[:release][0].match?(%r{5|6})
         pp = <<-PP
         class { 'epel':
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,8 @@ @@
           "operatingsystem": "RedHat",
           "operatingsystemrelease": [
             "7",
-            "8"
+            "8",
+            "9"
           ]
         },
         {
@@ Expand Down @@