Minor update to makefile target that builds the profiling images if missing

Author: marc-casavant

src/tests/multi-server/all.mk

@@ -14,7 +14,7 @@
 
 SHELL := /bin/bash
 
-PROFILE ?= profiling1
+PROFILE ?= default-profiling
 
 #
 #  Allow for stand-alone builds from the local directory.
@@ -228,19 +228,28 @@ test.multi-server.ci: $(TEST_MULTI_SERVER_CI_TESTS)
 #  any of the profiling tests.
 #
 
+
+# Crossbuild image
+FREERADIUS_CROSSBUILD_IMAGE := freeradius40x-build/ubuntu24:latest
 # Base profiling image, FreeRADIUS not built on this image
 FREERADIUS_PROF_IMAGE := freeradius4-$(PROFILE)/ubuntu24:latest
 # Multi-server profiling image; FreeRADIUS dev build specifically for profiling
 FREERADIUS_RADENV_PROF_IMAGE := freeradius-prof:latest
 
 .PHONY: freeradius-prof.image
 freeradius-prof.image:
-	${Q}if [ -n "$(FORCE_IMAGE_REBUILD)" ] || [ -z "$$(docker images -q $(FREERADIUS_RADENV_PROF_IMAGE) 2>/dev/null)" ]; then \
-		$(MAKE) -C $(top_srcdir) crossbuild.ubuntu24; \
+	${Q}if [ -n "$(FORCE_IMAGE_REBUILD)" ]; then \
+		$(MAKE) -C $(top_srcdir) crossbuild.ubuntu24.profile.regen; \
+		$(MAKE) -C $(top_srcdir) crossbuild.ubuntu24.profile.build; \
+		./src/tests/multi-server/scripts/build_image.sh; \
+	elif [ -z "$$(docker images -q $(FREERADIUS_PROF_IMAGE) 2>/dev/null)" ]; then \
+		$(MAKE) -C $(top_srcdir) crossbuild.ubuntu24.profile.regen; \
 		$(MAKE) -C $(top_srcdir) crossbuild.ubuntu24.profile.build; \
 		./src/tests/multi-server/scripts/build_image.sh; \
+	elif [ -z "$$(docker images -q $(FREERADIUS_RADENV_PROF_IMAGE) 2>/dev/null)" ]; then \
+		./src/tests/multi-server/scripts/build_image.sh; \
 	else \
-		echo "$(FREERADIUS_RADENV_PROF_IMAGE) available, skipping image creation"; \
+		echo "$(FREERADIUS_PROF_IMAGE) and $(FREERADIUS_RADENV_PROF_IMAGE) available, skipping image creation"; \
 	fi
 
 $(TEST_MULTI_SERVER_PROF_TESTS): freeradius-prof.image