Skip to content

Use pre-built uwsgi Docker image for tests #318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xlamorlette-datadog merged 3 commits into from
Mar 10, 2026
Merged

Use pre-built uwsgi Docker image for tests #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69e1eb6
In test Makefile target, set BASE_IMAGE if not set (so that it can be…
xlamorlette-datadog Mar 10, 2026
7e6272c
For tests, use pre-built uwsgi image, to avoid flakiness
xlamorlette-datadog Mar 10, 2026
db23c71
Factorize the build-push-xxx targets in build-push-multiarch
xlamorlette-datadog Mar 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 35 additions & 21 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,40 +34,54 @@ ifeq ($(DOCKER_PLATFORM),linux/aarch64)
DOCKER_PLATFORM := linux/arm64
endif

# On GitLab, we get the nginx_musl_toolchain Docker image from registry.ddbuild.io.
# Locally, we build the nginx_musl_toolchain Docker image, before using it in some
# targets via $(TOOLCHAIN_DEPENDENCY).
BUILD_IMAGE := nginx_musl_toolchain
CI_REGISTRY := registry.ddbuild.io/ci/nginx-datadog
CI_BUILD_IMAGE := $(CI_REGISTRY)/$(BUILD_IMAGE)
CI_TEST_IMAGE := $(CI_REGISTRY)/test
UWSGI_TEST_IMAGE := $(CI_REGISTRY)/uwsgi

# On GitLab, we get the Docker images from registry.ddbuild.io.
# Locally, we build them before using them in some targets via $(TOOLCHAIN_DEPENDENCY) and $(TEST_DEPENDENCY).
ifdef GITLAB_CI
TOOLCHAIN_DEPENDENCY :=
TEST_DEPENDENCY :=
else
TOOLCHAIN_DEPENDENCY := build-local-musl-toolchain
TEST_DEPENDENCY := build-local-uwsgi-test-image
endif

# build-push-musl-toolchain and build-push-test-image must be run, once, from a
# developer machine, to put in registry.ddbuild.io the needed Docker images.
.PHONY: build-push-musl-toolchain
build-push-musl-toolchain:
docker build --progress=plain --platform linux/amd64 --build-arg ARCH=x86_64 -t $(CI_BUILD_IMAGE):latest-amd64 build_env
docker push $(CI_BUILD_IMAGE):latest-amd64
docker build --progress=plain --platform linux/arm64 --build-arg ARCH=aarch64 -t $(CI_BUILD_IMAGE):latest-arm64 build_env
docker push $(CI_BUILD_IMAGE):latest-arm64
docker buildx imagetools create -t $(CI_BUILD_IMAGE):latest $(CI_BUILD_IMAGE):latest-amd64 $(CI_BUILD_IMAGE):latest-arm64

.PHONY: build-local-musl-toolchain
build-local-musl-toolchain:
docker build --progress=plain --platform $(DOCKER_PLATFORM) --build-arg ARCH=$(ARCH) $(if $(BASE_IMAGE), --build-arg BASE_IMAGE=$(BASE_IMAGE),) -t $(BUILD_IMAGE) build_env

.PHONY: build-local-uwsgi-test-image
build-local-uwsgi-test-image:
docker build --progress=plain --platform $(DOCKER_PLATFORM) -t $(UWSGI_TEST_IMAGE):latest test/services/uwsgi

# build-push-images-for-CI must be run, once, from a developer machine, to put in registry.ddbuild.io the needed Docker images.
.PHONY: build-push-images-for-CI
build-push-images-for-CI: build-push-musl-toolchain build-push-test-image build-push-uwsgi-test-image

.PHONY: build-push-musl-toolchain
build-push-musl-toolchain:
$(call build-push-multiarch,$(CI_BUILD_IMAGE),build_env)

.PHONY: build-push-test-image
build-push-test-image:
docker build --progress=plain --platform linux/amd64 --build-arg ARCH=x86_64 -t $(CI_TEST_IMAGE):latest-amd64 test
docker push $(CI_TEST_IMAGE):latest-amd64
docker build --progress=plain --platform linux/arm64 --build-arg ARCH=aarch64 -t $(CI_TEST_IMAGE):latest-arm64 test
docker push $(CI_TEST_IMAGE):latest-arm64
docker buildx imagetools create -t $(CI_TEST_IMAGE):latest $(CI_TEST_IMAGE):latest-amd64 $(CI_TEST_IMAGE):latest-arm64
$(call build-push-multiarch,$(CI_TEST_IMAGE),test)

.PHONY: build-push-uwsgi-test-image
build-push-uwsgi-test-image:
$(call build-push-multiarch,$(UWSGI_TEST_IMAGE),test/services/uwsgi)

# $(1): image name, $(2): build context
define build-push-multiarch
docker build --progress=plain --platform linux/amd64 --build-arg ARCH=x86_64 -t $(1):latest-amd64 $(2)
docker push $(1):latest-amd64
docker build --progress=plain --platform linux/arm64 --build-arg ARCH=aarch64 -t $(1):latest-arm64 $(2)
docker push $(1):latest-arm64
docker buildx imagetools create -t $(1):latest $(1):latest-amd64 $(1):latest-arm64
endef


# ----- Sources Dependencies, Format and Lint
Expand Down Expand Up @@ -221,16 +235,16 @@ build-musl-aux-ingress:
build-and-test: build-musl test

.PHONY: test
test:
python3 test/bin/run.py --image ${BASE_IMAGE} \
test: $(TEST_DEPENDENCY)
python3 test/bin/run.py --image $${BASE_IMAGE:-nginx:$(NGINX_VERSION)-alpine} \
--module-path .musl-build/ngx_http_datadog_module.so -- \
--verbose $(TEST_ARGS)

.PHONY: build-and-test-openresty
build-and-test-openresty: build-openresty test-openresty

.PHONY: test-openresty
test-openresty:
test-openresty: $(TEST_DEPENDENCY)
RESTY_TEST=ON python3 test/bin/run.py --image ${BASE_IMAGE} \
--module-path .openresty-build/ngx_http_datadog_module.so -- \
--verbose $(TEST_ARGS)
Expand Down
5 changes: 1 addition & 4 deletions test/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,7 @@ services:
# the service ("uwsgi") and the request's headers. This way, tests can see
# which trace context, if any, was propagated to the reverse proxied server.
uwsgi:
image: nginx-datadog-test-services-uwsgi
build:
context: ./services/uwsgi
dockerfile: ./Dockerfile
image: registry.ddbuild.io/ci/nginx-datadog/uwsgi
stop_signal: SIGQUIT
environment:
- DD_ENV=prod
Expand Down