Updated multi-server makefile to support latest updates made to the framework's jinja template rendering script.

marc-casavant · marc-casavant · commit a3fc004301f5 · 2026-02-10T10:39:41.000-05:00
diff --git a/src/tests/multi-server/all.mk b/src/tests/multi-server/all.mk
@@ -78,15 +78,15 @@ $(1): clone
 		echo "INFO: MULTI_SERVER_BUILD_DIR_REL_PATH=$(MULTI_SERVER_BUILD_DIR_REL_PATH)"; \
 		echo "INFO: LISTENER_DIR=$$$$LISTENER_DIR"; \
 		\
-		CMD="python3 src/config_builder.py --listener_type file --aux $(MULTI_SERVER_TESTS_BASE_DIR_ABS_PATH)environments/configs/freeradius/homeserver/radiusd.conf.j2 --includepath $(MULTI_SERVER_TESTS_BASE_DIR_ABS_PATH)"; \
+		CMD="python3 src/config_builder.py --vars-file $(MULTI_SERVER_TESTS_BASE_DIR_ABS_PATH)environments/jinja-vars/env-loadgen-5hs-vars.yml --aux-file $(MULTI_SERVER_TESTS_BASE_DIR_ABS_PATH)environments/configs/freeradius/homeserver/radiusd.conf.j2 --include-path $(MULTI_SERVER_TESTS_BASE_DIR_ABS_PATH)"; \
 		echo "INFO: CMD = $$$$CMD"; \
 		bash -c "$$$$CMD"; \
 		\
-		CMD="python3 src/config_builder.py --listener_type file --aux $(MULTI_SERVER_TESTS_BASE_DIR_ABS_PATH)environments/configs/freeradius/load-generator/radiusd.conf.j2 --includepath $(MULTI_SERVER_TESTS_BASE_DIR_ABS_PATH)"; \
+		CMD="python3 src/config_builder.py --vars-file $(MULTI_SERVER_TESTS_BASE_DIR_ABS_PATH)environments/jinja-vars/env-loadgen-5hs-vars.yml --aux-file $(MULTI_SERVER_TESTS_BASE_DIR_ABS_PATH)environments/configs/freeradius/load-generator/radiusd.conf.j2 --include-path $(MULTI_SERVER_TESTS_BASE_DIR_ABS_PATH)"; \
 		echo "INFO: CMD = $$$$CMD"; \
 		bash -c "$$$$CMD"; \
 		\
-		CMD="python3 src/config_builder.py --listener_type file --aux $(MULTI_SERVER_TESTS_BASE_DIR_ABS_PATH)environments/docker-compose/env-5hs-autoaccept.yml.j2 --includepath $(MULTI_SERVER_TESTS_BASE_DIR_ABS_PATH)"; \
+		CMD="python3 src/config_builder.py --vars-file $(MULTI_SERVER_TESTS_BASE_DIR_ABS_PATH)environments/jinja-vars/env-loadgen-5hs-vars.yml --aux-file $(MULTI_SERVER_TESTS_BASE_DIR_ABS_PATH)environments/docker-compose/env-5hs-autoaccept.yml.j2 --include-path $(MULTI_SERVER_TESTS_BASE_DIR_ABS_PATH)"; \
 		echo "INFO: CMD = $$$$CMD"; \
 		bash -c "$$$$CMD"; \
 		\

Original file line number	Diff line number	Diff line change
`@@ -78,15 +78,15 @@ $(1): clone`
`78`	`78`	`echo "INFO: MULTI_SERVER_BUILD_DIR_REL_PATH=$(MULTI_SERVER_BUILD_DIR_REL_PATH)"; \`
`79`	`79`	`echo "INFO: LISTENER_DIR=$$$$LISTENER_DIR"; \`
`80`	`80`	`\`
`81`		`- CMD="python3 src/config_builder.py --listener_type file --aux $(MULTI_SERVER_TESTS_BASE_DIR_ABS_PATH)environments/configs/freeradius/homeserver/radiusd.conf.j2 --includepath $(MULTI_SERVER_TESTS_BASE_DIR_ABS_PATH)"; \`
	`81`	`+ CMD="python3 src/config_builder.py --vars-file $(MULTI_SERVER_TESTS_BASE_DIR_ABS_PATH)environments/jinja-vars/env-loadgen-5hs-vars.yml --aux-file $(MULTI_SERVER_TESTS_BASE_DIR_ABS_PATH)environments/configs/freeradius/homeserver/radiusd.conf.j2 --include-path $(MULTI_SERVER_TESTS_BASE_DIR_ABS_PATH)"; \`
`82`	`82`	`echo "INFO: CMD = $$$$CMD"; \`
`83`	`83`	`bash -c "$$$$CMD"; \`
`84`	`84`	`\`
`85`		`- CMD="python3 src/config_builder.py --listener_type file --aux $(MULTI_SERVER_TESTS_BASE_DIR_ABS_PATH)environments/configs/freeradius/load-generator/radiusd.conf.j2 --includepath $(MULTI_SERVER_TESTS_BASE_DIR_ABS_PATH)"; \`
	`85`	`+ CMD="python3 src/config_builder.py --vars-file $(MULTI_SERVER_TESTS_BASE_DIR_ABS_PATH)environments/jinja-vars/env-loadgen-5hs-vars.yml --aux-file $(MULTI_SERVER_TESTS_BASE_DIR_ABS_PATH)environments/configs/freeradius/load-generator/radiusd.conf.j2 --include-path $(MULTI_SERVER_TESTS_BASE_DIR_ABS_PATH)"; \`
`86`	`86`	`echo "INFO: CMD = $$$$CMD"; \`
`87`	`87`	`bash -c "$$$$CMD"; \`
`88`	`88`	`\`
`89`		`- CMD="python3 src/config_builder.py --listener_type file --aux $(MULTI_SERVER_TESTS_BASE_DIR_ABS_PATH)environments/docker-compose/env-5hs-autoaccept.yml.j2 --includepath $(MULTI_SERVER_TESTS_BASE_DIR_ABS_PATH)"; \`
	`89`	`+ CMD="python3 src/config_builder.py --vars-file $(MULTI_SERVER_TESTS_BASE_DIR_ABS_PATH)environments/jinja-vars/env-loadgen-5hs-vars.yml --aux-file $(MULTI_SERVER_TESTS_BASE_DIR_ABS_PATH)environments/docker-compose/env-5hs-autoaccept.yml.j2 --include-path $(MULTI_SERVER_TESTS_BASE_DIR_ABS_PATH)"; \`
`90`	`90`	`echo "INFO: CMD = $$$$CMD"; \`
`91`	`91`	`bash -c "$$$$CMD"; \`
`92`	`92`	`\`