Merge pull request #244 from nmburgan/maint/main/aix_fix

(maint) Use unversioned AIX pe_repo class
puppetlabs · Dec 5, 2023 · fdee0d9 · fdee0d9
2 parents 73e9317 + 6dce89a
commit fdee0d9
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/lib/beaker-pe/install/pe_utils.rb b/lib/beaker-pe/install/pe_utils.rb
@@ -495,19 +495,14 @@ def deploy_frictionless_to_master(host)
           # For some platforms (e.g, redhatfips), packaging_platfrom is set and should
           # be used as the primary source of truth for the platform string.
           platform = host['packaging_platform'] || host['platform']
-          # We don't have a separate AIX 7.2 build prior to 2023, so it is
-          # classified as 7.1 for pe_repo purposes
-          if platform == "aix-7.2-power" && version_is_less(master[:pe_ver], '2023.0.0')
-            platform = "aix-7.1-power"
-          end
           klass = platform.gsub(/-/, '_').gsub(/\./,'')
           if host['platform'] =~ /windows/
             if host['template'] =~ /i386/
               klass = "pe_repo::platform::windows_i386"
             else
               klass = "pe_repo::platform::windows_x86_64"
             end
-          elsif platform =~ /aix-.*-power/ && !version_is_less(master[:pe_ver], '2022.99.99')
+          elsif platform =~ /aix-.*-power/ && !version_is_less(master[:pe_ver], '2019.0.3')
             klass = "pe_repo::platform::aix_power"
           else
             klass = "pe_repo::platform::#{klass}"