Removed the step to install packages on the self-hosted runner job. Packages are now pre-installed on the runner.

Author: marc-casavant

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

@@ -90,7 +90,7 @@ jobs:
             echo "Error: freeradius-build: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
+          make -f src/tests/multi-server/all.mk test-5hs-autoaccept VERBOSE=4
 
       - name: Verify test results
         shell: bash
@@ -159,17 +159,9 @@ jobs:
 
     env:
       MULTI_SERVER_TEST_LOG: build/tests/multi-server/freeradius-multi-server/multi_server_test.log
-
+      MULTI_SERVER_TEST_LISTENER_LOG: build/tests/multi-server/freeradius-listener-logs/custom_test-env-5hs-autoaccept.txt.bak
     steps:
 
-      #  Need git installed for checkout to behave normally
-      - name: Install multi-server framework test environment dependencies
-        run: |
-          apt-get update
-          apt-get install -y build-essential
-          apt-get install -y --no-install-recommends git git-lfs ca-certificates
-          make --version
-
       # Checkout, but defer pulling LFS objects until we've restored the cache
       - uses: actions/checkout@v4
         with:
@@ -220,12 +212,20 @@ jobs:
           if grep -q '\[Failed\]' "${MULTI_SERVER_TEST_LOG}"; then
             echo "TEST FAILED: Found [Failed] in log"
             grep '\[Failed\]' "${MULTI_SERVER_TEST_LOG}"
+
+            # Display the framework's listener log for debugging purposes
+            echo "============ ${MULTI_SERVER_TEST_LISTENER_LOG} ============"
+            cat "${MULTI_SERVER_TEST_LISTENER_LOG}"
             exit 1
           fi
 
           if grep -Eq '\(Failures:[[:space:]]*[1-9][0-9]*[[:space:]]*\)' "${MULTI_SERVER_TEST_LOG}"; then
             echo "TEST FAILED: Found Failures > 0 in log"
             grep -E '\(Failures:[[:space:]]*[1-9][0-9]*[[:space:]]*\)' "${MULTI_SERVER_TEST_LOG}"
+
+            # Display the framework's listener log for debugging purposes
+            echo "============ ${MULTI_SERVER_TEST_LISTENER_LOG} ============"
+            cat "${MULTI_SERVER_TEST_LISTENER_LOG}"
             exit 1
           fi
 
@@ -254,6 +254,10 @@ jobs:
             : # PASS
           else
             echo "TEST FAILED: No Matched line found with equal non-zero counts"
+
+            # Display the framework's listener log for debugging purposes
+            echo "============ ${MULTI_SERVER_TEST_LISTENER_LOG} ============"
+            cat "${MULTI_SERVER_TEST_LISTENER_LOG}"
             exit 1
           fi
 

src/tests/multi-server/all.mk

@@ -10,7 +10,15 @@ FREERADIUS_MULTI_SERVER_TESTS_BASE_PATH_ABS := $(FREERADIUS_SERVER_SRC_PATH_ABS)
 FREERADIUS_MULTI_SERVER_BUILD_DIR_PATH_ABS := $(FREERADIUS_SERVER_BUILD_DIR_PATH_ABS)/tests/multi-server
 FREERADIUS_MULTI_SERVER_FRAMEWORK_GIT_REPO := https://github.com/InkbridgeNetworks/freeradius-multi-server.git
 
-.PHONY: 5hs-autoaccept-env-setup test-5hs-autoaccept test-5hs-autoaccept-5min test-5hs-autoaccept-full-config-and-run
+# Multi-server test verbosity level
+VERBOSE ?= 1
+VERBOSE_LEVEL_1 := -v
+VERBOSE_LEVEL_2 := -vv
+VERBOSE_LEVEL_3 := -vvv
+VERBOSE_LEVEL_4 := -vvvv
+VERBOSE_ARG := $(VERBOSE_LEVEL_$(VERBOSE))
+
+.PHONY: 5hs-autoaccept-env-setup test-5hs-autoaccept test-5hs-autoaccept-5min
 
 5hs-autoaccept-env-setup:
 	@set -e; \
@@ -69,7 +77,7 @@ test-5hs-autoaccept: 5hs-autoaccept-env-setup
 	echo "INFO: Running test-5hs-autoaccept test using framework"; \
 	DATA_PATH="$(FREERADIUS_MULTI_SERVER_TESTS_BASE_PATH_ABS)/environments/configs" \
 	make test-framework \
-		-- -x -v \
+		-- -x $(VERBOSE_ARG) \
 		--compose "$(FREERADIUS_MULTI_SERVER_TESTS_BASE_PATH_ABS)/environments/docker-compose/env-5hs-autoaccept.yml" \
 		--test "$(FREERADIUS_MULTI_SERVER_TESTS_BASE_PATH_ABS)/test-5hs-autoaccept.yml" \
 		--use-files \
@@ -85,62 +93,8 @@ test-5hs-autoaccept-5min: 5hs-autoaccept-env-setup
 	echo "INFO: Running test-5hs-autoaccept test using framework"; \
 	DATA_PATH="$(FREERADIUS_MULTI_SERVER_TESTS_BASE_PATH_ABS)/environments/configs" \
 	make test-framework \
-		-- -x -v \
+		-- -x $(VERBOSE_ARG) \
 		--compose "$(FREERADIUS_MULTI_SERVER_TESTS_BASE_PATH_ABS)/environments/docker-compose/env-5hs-autoaccept.yml" \
 		--test "$(FREERADIUS_MULTI_SERVER_TESTS_BASE_PATH_ABS)/test-5hs-autoaccept-5min.yml" \
 		--use-files \
 		--listener-dir "$$MULTI_SERVER_FRAMEWORK_LISTENER_LOGS_DIR_ABS"
-
-test-5hs-autoaccept-full-config-and-run:
-	@set -e; \
-	\
-	echo "INFO: FREERADIUS_SERVER_SRC_PATH_REL=$(FREERADIUS_SERVER_SRC_PATH_REL)"; \
-	echo "INFO: FREERADIUS_SERVER_SRC_PATH_ABS=$(FREERADIUS_SERVER_SRC_PATH_ABS)"; \
-	echo "INFO: FREERADIUS_SERVER_BUILD_DIR_PATH_ABS=$(FREERADIUS_SERVER_BUILD_DIR_PATH_ABS)"; \
-	echo "INFO: FREERADIUS_MULTI_SERVER_TESTS_BASE_PATH_ABS=$(FREERADIUS_MULTI_SERVER_TESTS_BASE_PATH_ABS)"; \
-	echo "INFO: FREERADIUS_MULTI_SERVER_BUILD_DIR_PATH_ABS=$(FREERADIUS_MULTI_SERVER_BUILD_DIR_PATH_ABS)"; \
-	\
-	cd $(FREERADIUS_MULTI_SERVER_BUILD_DIR_PATH_ABS); \
-	\
-	if [ ! -d freeradius-multi-server/.git ]; then \
-		git clone https://github.com/InkbridgeNetworks/freeradius-multi-server.git; \
-	else \
-		( cd freeradius-multi-server && git pull ); \
-	fi; \
-	\
-	cd freeradius-multi-server; \
-	$(MAKE) configure; \
-	. .venv/bin/activate; \
-	\
-	echo "INFO: Currently in $$(pwd)"; \
-	\
-	MULTI_SERVER_ENV_VARS_FILE_PATH_ABS="$(FREERADIUS_MULTI_SERVER_TESTS_BASE_PATH_ABS)/environments/jinja-vars/env-5hs-autoaccept.vars.yml"; \
-	MULTI_SERVER_FRAMEWORK_LISTENER_LOGS_DIR_ABS="$(FREERADIUS_MULTI_SERVER_BUILD_DIR_PATH_ABS)/freeradius-listener-logs"; \
-	JINJA_RENDERING_SCOPE_PATH_ABS="$(FREERADIUS_MULTI_SERVER_TESTS_BASE_PATH_ABS)"; \
-	echo "INFO: MULTI_SERVER_ENV_VARS_FILE_PATH_ABS=$$MULTI_SERVER_ENV_VARS_FILE_PATH_ABS"; \
-	echo "INFO: MULTI_SERVER_FRAMEWORK_LISTENER_LOGS_DIR_ABS=$$MULTI_SERVER_FRAMEWORK_LISTENER_LOGS_DIR_ABS"; \
-	echo "INFO: JINJA_RENDERING_SCOPE_PATH_ABS=$$JINJA_RENDERING_SCOPE_PATH_ABS"; \
-	\
-	python3 src/config_builder.py \
-	--vars-file "$$MULTI_SERVER_ENV_VARS_FILE_PATH_ABS" \
-	--aux-file "$(FREERADIUS_MULTI_SERVER_TESTS_BASE_PATH_ABS)/environments/configs/freeradius/homeserver/radiusd.conf.j2" \
-	--include-path "$$JINJA_RENDERING_SCOPE_PATH_ABS"; \
-	\
-	python3 src/config_builder.py \
-	--vars-file "$$MULTI_SERVER_ENV_VARS_FILE_PATH_ABS" \
-	--aux-file "$(FREERADIUS_MULTI_SERVER_TESTS_BASE_PATH_ABS)/environments/configs/freeradius/load-generator/radiusd.conf.j2" \
-	--include-path "$$JINJA_RENDERING_SCOPE_PATH_ABS"; \
-	\
-	python3 src/config_builder.py \
-	--vars-file "$$MULTI_SERVER_ENV_VARS_FILE_PATH_ABS" \
-	--aux-file "$(FREERADIUS_MULTI_SERVER_TESTS_BASE_PATH_ABS)/environments/docker-compose/env-5hs-autoaccept.yml.j2" \
-	--include-path "$$JINJA_RENDERING_SCOPE_PATH_ABS"; \
-	\
-	echo "INFO: Running test-5hs-autoaccept test using framework"; \
-	DATA_PATH="$(FREERADIUS_MULTI_SERVER_TESTS_BASE_PATH_ABS)/environments/configs" \
-	make test-framework \
-		-- -x -v \
-		--compose "$(FREERADIUS_MULTI_SERVER_TESTS_BASE_PATH_ABS)/environments/docker-compose/env-5hs-autoaccept.yml" \
-		--test "$(FREERADIUS_MULTI_SERVER_TESTS_BASE_PATH_ABS)/test-5hs-autoaccept.yml" \
-		--use-files \
-		--listener-dir "$$MULTI_SERVER_FRAMEWORK_LISTENER_LOGS_DIR_ABS"