Adding a final step to verify the results from the multi-server test logs. Also using env variables to make it easy to change the OS used for the docker build.

Author: marc-casavant

.github/workflows/ci-multi-server-tests.yml

@@ -14,6 +14,11 @@ on:
 jobs:
   test-5hs-autoaccept:
     runs-on: ubuntu-24.04
+
+    env:
+      DOCKER_BUILD_OS: ubuntu22
+      MULTI_SERVER_TEST_LOG: build/tests/multi-server/freeradius-multi-server/multi_server_test.log
+
     steps:
       # Checkout, but defer pulling LFS objects until we've restored the cache
       - uses: actions/checkout@v4
@@ -58,20 +63,38 @@ jobs:
       - name: Build Docker image for multi-server test environment
         run: |
           ./configure
-          make docker.ubuntu22.build
+          make docker.${DOCKER_BUILD_OS}.build
 
           # List all images
           docker images --all
 
-          # Retag image to what the compose/test harness expects
-          docker tag freeradius4/ubuntu22:latest fr-build-ubuntu22:latest
+          # Retag image to what the multi-server test's docker compose environment expects
+          docker tag freeradius4/${DOCKER_BUILD_OS}:latest fr-build-${DOCKER_BUILD_OS}:latest
 
-          docker images --format 'table {{.Repository}}\t{{.Tag}}\t{{.ID}}' | grep -E 'freeradius4/ubuntu22|fr-build-ubuntu22'
+          docker images --format 'table {{.Repository}}\t{{.Tag}}\t{{.ID}}' | grep -E "freeradius4/${DOCKER_BUILD_OS}|fr-build-${DOCKER_BUILD_OS}"
 
       - name: Run test-5hs-autoaccept test
         run: |
-          if ! docker images --format '{{.Repository}}:{{.Tag}}' | grep -q '^fr-build-ubuntu22:latest$'; then
-            echo "Error: fr-build-ubuntu22:latest Docker image not found and required for multi-server test environment."
+          if ! docker images --format '{{.Repository}}:{{.Tag}}' | grep -q "^fr-build-${DOCKER_BUILD_OS}:latest$"; then
+            echo "Error: fr-build-${DOCKER_BUILD_OS}:latest Docker image not found and required for multi-server test environment."
             exit 1
           fi
           make -f src/tests/multi-server/all.mk test-5hs-autoaccept
+
+      - name: Verify test results
+        run: |
+          echo "==== ${MULTI_SERVER_TEST_LOG} ===="
+          cat "${MULTI_SERVER_TEST_LOG}"
+
+          if grep -q '\[Failed\]' "${MULTI_SERVER_TEST_LOG}"; then
+            echo "Test failed: Found [Failed] in log"
+            grep '\[Failed\]' "${MULTI_SERVER_TEST_LOG}"
+            exit 1
+          fi
+
+          if ! grep -q '\[Passed\] Matched:' "${MULTI_SERVER_TEST_LOG}"; then
+            echo "Test failed: No [Passed] Matched: found in log"
+            exit 1
+          fi
+
+          echo "Test results verified: No [Failed] found and at least one [Passed] Matched: present."