Skip to content

ci: Run the test suite through one Makefile target #863

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
vvoytovych merged 1 commit into from
Nov 5, 2026
Merged

ci: Run the test suite through one Makefile target #863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,4 @@ jobs:
uses: datum-cloud/actions/.github/workflows/ci-basic.yaml@v1.26.0
with:
skip: docker,test
run: |
make locations-crds
go install sigs.k8s.io/controller-runtime/tools/setup-envtest@32759fab31191897ae86091d8831b2d4b890aedd
KUBEBUILDER_ASSETS="$(setup-envtest use 1.31.0 -p path)" go test $(go list ./... | grep -v /e2e)
run: make test-suite
25 changes: 20 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Image URL to use all building/pushing image targets
IMG ?= ghcr.io/datum-cloud/network-services-operator:latest
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
ENVTEST_K8S_VERSION = 1.31.0

# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
ifeq (,$(shell go env GOBIN))
Expand Down Expand Up @@ -66,8 +64,11 @@ locations-crds: kustomize ## Render the locations service CRDs envtest installs.
$(KUSTOMIZE) build config/tools/locations-crds -o $(LOCALBIN)/crds/locations

.PHONY: test
test: manifests generate fmt vet envtest locations-crds ## Run tests.
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test $$(go list ./... | grep -v /e2e) -coverprofile cover.out
test: manifests generate fmt vet test-suite ## Generate the code, then run the unit and envtest suite.

.PHONY: test-suite
test-suite: envtest locations-crds ## Run the unit and envtest suite, as CI's required check does.
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test $$(go list ./... | grep -v /e2e)

# The e2e suite runs against the two-cluster prod-fidelity env; bring it up and
# run it with `task test-infra:up` then `task test-infra:test-e2e`
Expand Down Expand Up @@ -265,7 +266,16 @@ GO_LICENSES ?= $(LOCALBIN)/go-licenses
KUSTOMIZE_VERSION ?= v5.5.0
CONTROLLER_TOOLS_VERSION ?= v0.17.3
DEFAULTER_GEN_VERSION ?= v0.32.3
ENVTEST_VERSION ?= release-0.19
#ENVTEST_VERSION is the controller-runtime version to use for setup-envtest, derived from go.mod
ENVTEST_VERSION ?= $(shell v='$(call gomodver,sigs.k8s.io/controller-runtime)'; \
[ -n "$$v" ] || { echo "Set ENVTEST_VERSION manually (controller-runtime replace has no tag)" >&2; exit 1; }; \
printf '%s\n' "$$v")

#ENVTEST_K8S_VERSION is the version of Kubernetes to use for setting up ENVTEST binaries, derived from go.mod's k8s.io/api
ENVTEST_K8S_VERSION ?= $(shell v='$(call gomodver,k8s.io/api)'; \
[ -n "$$v" ] || { echo "Set ENVTEST_K8S_VERSION manually (k8s.io/api replace has no tag)" >&2; exit 1; }; \
printf '%s\n' "$$v" | sed -E 's/^v?[0-9]+\.([0-9]+).*/1.\1/')

GOLANGCI_LINT_VERSION ?= v2.15.0

# renovate: datasource=go depName=github.com/cert-manager/cert-manager
Expand Down Expand Up @@ -335,6 +345,11 @@ go-licenses: ## Find or download go-licenses
# $1 - target path with name of binary
# $2 - package url which can be installed
# $3 - specific version of package
# gomodver prints a module's version from go.mod, or its replacement's.
define gomodver
$(shell go list -m -f '{{if .Replace}}{{.Replace.Version}}{{else}}{{.Version}}{{end}}' $(1) 2>/dev/null)
endef

define go-install-tool
@[ -f "$(1)-$(3)" ] || { \
set -e; \
Expand Down
Loading