WIP: add nftables+firewalld tests to CI

Signed-off-by: Rob Murray <[email protected]>

Author: robmry

.github/workflows/.test.yml

@@ -144,8 +144,9 @@ jobs:
               // { os: 'ubuntu-24.04', mode: 'rootless-systemd' }, // FIXME: https://github.com/moby/moby/issues/44084
             ];
             if ("${{ inputs.storage }}" == "snapshotter") {
-              includes.push({ os: 'ubuntu-24.04', mode: 'firewalld' });
+              includes.push({ os: 'ubuntu-24.04', mode: 'iptables+firewalld' });
               includes.push({ os: 'ubuntu-24.04', mode: 'nftables' });
+              includes.push({ os: 'ubuntu-24.04', mode: 'nftables+firewalld' });
             }
             await core.group(`Set matrix`, async () => {
               core.info(`matrix: ${JSON.stringify(includes)}`);
@@ -336,15 +337,15 @@ jobs:
             // statically define the list of test suites that we want to run.
             if ("${{ inputs.storage }}" == "snapshotter") {
               matrix.include.push({
-                'mode': 'firewalld',
+                'mode': 'iptables+firewalld',
                 'test': 'DockerCLINetworkSuite|DockerCLIPortSuite|DockerDaemonSuite'
               });
               matrix.include.push({
-                'mode': 'firewalld',
+                'mode': 'iptables+firewalld',
                 'test': 'DockerSwarmSuite'
               });
               matrix.include.push({
-                'mode': 'firewalld',
+                'mode': 'iptables+firewalld',
                 'test': 'DockerNetworkSuite'
               });
               matrix.include.push({
@@ -359,6 +360,18 @@ jobs:
                 'mode': 'nftables',
                 'test': 'DockerNetworkSuite'
               });
+              matrix.include.push({
+                'mode': 'nftables+firewalld',
+                'test': 'DockerCLINetworkSuite|DockerCLIPortSuite|DockerDaemonSuite'
+              });
+              matrix.include.push({
+                'mode': 'nftables+firewalld',
+                'test': 'DockerSwarmSuite'
+              });
+              matrix.include.push({
+                'mode': 'nftables+firewalld',
+                'test': 'DockerNetworkSuite'
+              });
             }
             await core.group(`Set matrix`, async () => {
               core.info(`matrix: ${JSON.stringify(matrix)}`);