Skip to content

Commit 6aeaff3

Browse files
marc-casavantCopilot
andcommitted
multi-server test make target updated to work with latest profiling image structure
Co-authored-by: Copilot <copilot@github.com>
1 parent e9215da commit 6aeaff3

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

src/tests/multi-server/all.mk

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,16 +220,21 @@ test.multi-server.ci: $(TEST_MULTI_SERVER_CI_TESTS)
220220
# Ensure the freeradius-prof image is present before running
221221
# any of the profiling tests.
222222
#
223+
224+
# Base profiling image, FreeRADIUS not built on this image
223225
FREERADIUS_PROF_IMAGE := freeradius4-$(PROFILE)/ubuntu24:latest
226+
# Multi-server profiling image; FreeRADIUS dev build specifically for profiling
227+
FREERADIUS_RADENV_PROF_IMAGE := freeradius-prof:latest
224228

225229
.PHONY: freeradius-prof.image
226230
freeradius-prof.image:
227-
${Q}if [ -n "$(FORCE_IMAGE_REBUILD)" ] || [ -z "$$(docker images -q $(FREERADIUS_PROF_IMAGE) 2>/dev/null)" ]; then \
228-
$(MAKE) -C $(top_srcdir) docker.ubuntu24.prof; \
231+
${Q}if [ -n "$(FORCE_IMAGE_REBUILD)" ] || [ -z "$$(docker images -q $(FREERADIUS_RADENV_PROF_IMAGE) 2>/dev/null)" ]; then \
232+
$(MAKE) -C $(top_srcdir) crossbuild.ubuntu24; \
233+
$(MAKE) -C $(top_srcdir) crossbuild.ubuntu24.profile.build; \
234+
./src/tests/multi-server/scripts/build_image.sh; \
229235
else \
230-
echo "$(FREERADIUS_PROF_IMAGE) available, skipping image creation"; \
236+
echo "$(FREERADIUS_RADENV_PROF_IMAGE) available, skipping image creation"; \
231237
fi
232-
${Q}docker tag $(FREERADIUS_PROF_IMAGE) freeradius-prof:latest
233238

234239
$(TEST_MULTI_SERVER_PROF_TESTS): freeradius-prof.image
235240

0 commit comments

Comments
 (0)