test(suse): update to Leap 15.4

openSUSE Leap 15.3 is discontinued - test with 15.4 containers instead.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>

php/map.jinja

@@ -3025,18 +3025,22 @@
                     'zip': 'php8-zip',
                 },
                 'fpm': {
-                    'conf': '/etc/php8/fpm/php-fpm.conf',
-                    'ini': '/etc/php8/conf.d/salt.ini',
-                    'pools': '/etc/php8/fpm/php-fpm.d',
+                    'conf': '/etc/php-fpm.conf',
+                    'ini': '/etc/php.ini',
+                    'pools': '/etc/php-fpm.d',
                     'service': 'php-fpm',
                     'user': 'root',
                     'group': 'root',
                     'defaults': {
-                        'include': '/etc/php8/fpm/php-fpm.d/*.conf',
+                        'global': {
+                            'pid': '/var/run/php-fpm/php-fpm.pid',
+                            'error_log': '/var/log/php-fpm/error.log',
+                        },
+                        'include': '/etc/php-fpm.d/*.conf',
                     },
                 },
                 'cli': {
-                    'ini': '/etc/php8/cli/php.ini',
+                    'ini': '/etc/php.ini',
                 },
             },
             'Arch': {

test/integration/default/files/_mapdata/opensuse-15.yaml

@@ -199,14 +199,17 @@ values:
         soap.wsdl_cache_ttl: 86400
   lookup:
     cli:
-      ini: /etc/php8/cli/php.ini
+      ini: /etc/php.ini
     fpm:
-      conf: /etc/php8/fpm/php-fpm.conf
+      conf: /etc/php-fpm.conf
       defaults:
-        include: /etc/php8/fpm/php-fpm.d/*.conf
+        global:
+          error_log: /var/log/php-fpm/error.log
+          pid: /var/run/php-fpm/php-fpm.pid
+        include: /etc/php-fpm.d/*.conf
       group: root
-      ini: /etc/php8/conf.d/salt.ini
-      pools: /etc/php8/fpm/php-fpm.d
+      ini: /etc/php.ini
+      pools: /etc/php-fpm.d
       service: php-fpm
       user: root
     pkgs:

test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml

@@ -199,14 +199,17 @@ values:
         soap.wsdl_cache_ttl: 86400
   lookup:
     cli:
-      ini: /etc/php8/cli/php.ini
+      ini: /etc/php.ini
     fpm:
-      conf: /etc/php8/fpm/php-fpm.conf
+      conf: /etc/php-fpm.conf
       defaults:
-        include: /etc/php8/fpm/php-fpm.d/*.conf
+        global:
+          error_log: /var/log/php-fpm/error.log
+          pid: /var/run/php-fpm/php-fpm.pid
+        include: /etc/php-fpm.d/*.conf
       group: root
-      ini: /etc/php8/conf.d/salt.ini
-      pools: /etc/php8/fpm/php-fpm.d
+      ini: /etc/php.ini
+      pools: /etc/php-fpm.d
       service: php-fpm
       user: root
     pkgs: