Skip to content

test: e2e fixture improvements #238

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
jason-lynch merged 3 commits into from
Jan 14, 2026
Merged

test: e2e fixture improvements #238

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
194e61c
fix: correct version number in test builds
jason-lynch Jan 5, 2026
36e576a
refactor: e2e fixture vars files
jason-lynch Jan 5, 2026
3f28466
chore: add top-level e2e fixture make targets
jason-lynch Jan 7, 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
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ commands:
command: |
uname -m > /tmp/mod-checksums.txt
md5sum ./go.sum >> /tmp/mod-checksums.txt
md5sum tools.mk >> /tmp/mod-checksums.txt
md5sum common.mk >> /tmp/mod-checksums.txt
- restore_cache:
keys:
- v4-go-mod-{{ checksum "/tmp/mod-checksums.txt" }}
Expand Down
87 changes: 83 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
include tools.mk
include common.mk

# Overridable vars
DEBUG ?= 0
LOG_LEVEL ?= info
DEV_IMAGE_REPO ?= ghcr.io/pgedge
CONTROL_PLANE_IMAGE_REPO ?= host.docker.internal:5000/control-plane
CONTROL_PLANE_VERSION ?= $(shell git describe --tags --abbrev=0 --match 'v*')
E2E_FIXTURE ?=
E2E_PARALLEL ?=
E2E_PARALLEL ?= 8
E2E_RUN ?=
E2E_SKIP_CLEANUP ?= 0
E2E_DEBUG ?= 0
E2E_DEBUG_DIR ?=
FIXTURE_VARIANT ?= large
FIXTURE_CONTROL_PLANE_IMAGE ?=
FIXTURE_EXTRA_VARS ?=
CLUSTER_TEST_PARALLEL ?=
CLUSTER_TEST_RUN ?=
CLUSTER_TEST_SKIP_IMAGE_BUILD ?= 0
Expand All @@ -28,7 +30,7 @@ docker_compose_dev=WORKSPACE_DIR=$(shell pwd) \
DEV_IMAGE_REPO=$(DEV_IMAGE_REPO) \
docker compose -f ./docker/control-plane-dev/docker-compose.yaml
docker_compose_ci=docker compose -f ./docker/control-plane-ci/docker-compose.yaml
e2e_args=-tags=e2e_test -count=1 -timeout=20m ./e2e/... \
e2e_args=-tags=e2e_test -count=1 -timeout=45m ./e2e/... \
$(if $(E2E_PARALLEL),-parallel $(E2E_PARALLEL)) \
$(if $(E2E_RUN),-run $(E2E_RUN)) \
-args \
Expand Down Expand Up @@ -149,6 +151,83 @@ licenses-ci: licenses
.PHONY: ci
ci: test-ci lint-ci licenses-ci

################
# e2e fixtures #
################

_fixture_extra_vars=$(if $(FIXTURE_CONTROL_PLANE_IMAGE),external_control_plane_image=$(FIXTURE_CONTROL_PLANE_IMAGE) ,)$(FIXTURE_EXTRA_VARS)

# Set to 'goreleaser-build' if no external image is specified
_fixture_goreleaser_build=$(if $(findstring external_control_plane_image,$(_fixture_extra_vars)),,goreleaser-build)

.PHONY: _deploy-%-fixture
_deploy-%-fixture: $(_fixture_goreleaser_build)
VARIANT=$(FIXTURE_VARIANT) \
EXTRA_VARS='$(_fixture_extra_vars)' \
$(MAKE) -C e2e/fixtures \
deploy-$*-machines \
setup-$*-hosts \
deploy-$*-control-plane

.PHONY: deploy-lima-fixture
deploy-lima-fixture: _deploy-lima-fixture

.PHONY: deploy-ec2-fixture
deploy-ec2-fixture: _deploy-ec2-fixture

.PHONY: _update-%-fixture
_update-%-fixture: $(_fixture_goreleaser_build)
VARIANT=$(FIXTURE_VARIANT) \
EXTRA_VARS='$(_fixture_extra_vars)' \
$(MAKE) -C e2e/fixtures \
deploy-$*-control-plane

.PHONY: update-lima-fixture
update-lima-fixture: _update-lima-fixture

.PHONY: update-ec2-fixture
update-ec2-fixture: _update-ec2-fixture

.PHONY: _reset-%-fixture
_reset-%-fixture: $(_fixture_goreleaser_build)
VARIANT=$(FIXTURE_VARIANT) \
EXTRA_VARS='$(_fixture_extra_vars)' \
$(MAKE) -C e2e/fixtures \
teardown-$*-control-plane \
deploy-$*-control-plane

.PHONY: reset-lima-fixture
reset-lima-fixture: _reset-lima-fixture

.PHONY: reset-ec2-fixture
reset-ec2-fixture: _reset-ec2-fixture

.PHONY: _stop-%-fixture
_stop-%-fixture:
VARIANT=$(FIXTURE_VARIANT) \
EXTRA_VARS='$(_fixture_extra_vars)' \
$(MAKE) -C e2e/fixtures \
stop-$*-machines

.PHONY: stop-lima-fixture
stop-lima-fixture: _stop-lima-fixture

.PHONY: stop-ec2-fixture
stop-ec2-fixture: _stop-ec2-fixture

.PHONY: _teardown-%-fixture
_teardown-%-fixture:
VARIANT=$(FIXTURE_VARIANT) \
EXTRA_VARS='$(_fixture_extra_vars)' \
$(MAKE) -C e2e/fixtures \
teardown-$*-machines

.PHONY: teardown-lima-fixture
teardown-lima-fixture: _teardown-lima-fixture

.PHONY: teardown-ec2-fixture
teardown-ec2-fixture: _teardown-ec2-fixture

###############
# image build #
###############
Expand Down
2 changes: 1 addition & 1 deletion api/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include ../tools.mk
include ../common.mk

.PHONY: generate-v1
generate-v1:
Expand Down
5 changes: 5 additions & 0 deletions tools.mk → common.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ changie=$(gobin)/changie
yamlfmt=$(gobin)/yamlfmt
go-licenses=$(gobin)/go-licenses

CHANGIE_LATEST = $(shell $(changie) latest)
# deferred simple variable expansion pattern:
# https://make.mad-scientist.net/deferred-simple-variable-expansion/
CONTROL_PLANE_VERSION ?= $(eval CONTROL_PLANE_VERSION := $$(shell git fetch --quiet && git describe --tags --abbrev=0 --match 'v*' $$(CHANGIE_LATEST)))$(CONTROL_PLANE_VERSION)

.PHONY: install-tools
install-tools:
go install gotest.tools/gotestsum@v1.13.0
Expand Down
Loading