Add NAT integration tests in matrix

.github/workflows/ci-reusable.yml

@@ -68,6 +68,11 @@ jobs:
         if: matrix.tests == 'libstorage' || matrix.tests == 'all'
         run: make -j${ncpu} testLibstorage
 
+      ## Part 4 Tests ##
+      - name: NAT integration tests
+        if: matrix.tests == 'nat-integration'
+        run: make testNatIntegration
+
   status:
     if: always()
     needs: [build]

.github/workflows/ci.yml

@@ -40,18 +40,6 @@ jobs:
       matrix: ${{ needs.matrix.outputs.matrix }}
       cache_nonce: ${{ needs.matrix.outputs.cache_nonce }}
 
-  nat-integration:
-    name: NAT integration tests
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          ref: ${{ github.event.pull_request.head.sha }}
-      - name: Run NAT integration tests
-        run: make testNatIntegration
-
   linting:
     runs-on: ubuntu-latest
     if: github.event_name == 'pull_request'

tools/scripts/ci-job-matrix.sh

@@ -117,11 +117,22 @@ libstorage_test () {
   job
 }
 
+# outputs a NAT integration test job
+# Linux-only: miniupnpd is a Linux daemon, network namespace manipulation requires Linux
+nat_integration_test () {
+  job_tests="nat-integration"
+  job_includes=""
+  job
+}
+
 # outputs jobs for all test types
 all_tests () {
   unit_test
   integration_test
   libstorage_test
+  if [ "$job_os" = "linux" ]; then
+    nat_integration_test
+  fi
 }
 
 # outputs jobs for the specified operating systems and all test types