Fix failing test suites for amazonlinux-2023, ubuntu-2404, and opensuse-leap-15 (#825)

* Fix failing test suites for specific platform combinations

Co-authored-by: damacus <40786+damacus@users.noreply.github.com>

* Fix RSpec test for PHP module to expect PHP 8.3 on Ubuntu 24.04+

Co-authored-by: ramereth <48997+ramereth@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: damacus <40786+damacus@users.noreply.github.com>
Co-authored-by: ramereth <48997+ramereth@users.noreply.github.com>

Author: 3 people

kitchen.yml

@@ -54,8 +54,6 @@ suites:
   - name: mod_wsgi
     run_list:
       - recipe[test::wsgi]
-    excludes:
-      - amazonlinux-2023
   - name: mod_auth_cas
     run_list:
       - recipe[test::auth_cas]

libraries/helpers.rb

@@ -407,7 +407,11 @@ def apache_mod_php_package
         when 'rhel'
           'mod_php'
         when 'suse'
-          'apache2-mod_php7'
+          if platform?('opensuse') && node['platform_version'].to_f >= 15.5
+            'apache2-mod_php8'
+          else
+            'apache2-mod_php7'
+          end
         end
       end
 
@@ -444,16 +448,22 @@ def apache_mod_php_filename
             'libphp7.2.so'
           elsif platform?('ubuntu') && node['platform_version'].to_f == 20.04
             'libphp7.4.so'
-          elsif platform?('ubuntu') && node['platform_version'].to_f >= 22.04
+          elsif platform?('ubuntu') && node['platform_version'].to_f >= 22.04 && node['platform_version'].to_f < 24.04
             'libphp8.1.so'
+          elsif platform?('ubuntu') && node['platform_version'].to_f >= 24.04
+            'libphp8.3.so'
           else
             'libphp7.0.so'
           end
         when 'rhel'
           # TODO: Remove when we no longer support RHEL 7
           node['platform_version'].to_i >= 8 ? 'libphp7.so' : 'libphp5.so'
         when 'suse'
-          'mod_php7.so'
+          if platform?('opensuse') && node['platform_version'].to_f >= 15.5
+            'mod_php8.so'
+          else
+            'mod_php7.so'
+          end
         end
       end
 

resources/mod_wsgi.rb

@@ -19,11 +19,9 @@
          description: 'Whether to install the Apache WSGI module package'
 
 action :create do
-  raise 'apache2_mod_wsgi resource is not supported on amazonlinux' if platform?('amazon')
-
   # install mod_wsgi package (if requested)
   package new_resource.package_name do
-    only_if { new_resource.install_package }
+    only_if { new_resource.install_package && !new_resource.package_name.nil? }
     notifies :delete, 'directory[purge distro conf.modules.d]', :immediately
   end
 

spec/resources/mod_php_spec.rb

@@ -33,7 +33,7 @@
     it do
       is_expected.to enable_apache2_module('php').with(
         identifier: 'php_module',
-        mod_name: 'libphp8.1.so'
+        mod_name: 'libphp8.3.so'
       )
     end
   end