Skip to content

Commit faec228

Browse files
committed
fix: review
1 parent d3a0402 commit faec228

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ test-e2e: manifests generate fmt vet ginkgo
166166
FIREWALL_NETWORKS=$(E2E_FIREWALL_NETWORKS) \
167167
ARTIFACTS=$(ARTIFACTS) \
168168
E2E_DEFAULT_FLAVOR=$(E2E_DEFAULT_FLAVOR) \
169+
KUBETEST_CONFIGURATION="$(shell git rev-parse --show-toplevel)/test/e2e/frmwrk/data/kubetest/conformance.yaml" \
169170
$(GINKGO) -vv -r --junit-report="junit.e2e_suite.xml" --output-dir="$(ARTIFACTS)" --label-filter="$(E2E_LABEL_FILTER)" -timeout 60m ./test/e2e/frmwrk
170171

171172
.PHONY: lint

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ module github.com/metal-stack/cluster-api-provider-metal-stack
33
go 1.23.0
44

55
require (
6-
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46
76
github.com/go-logr/logr v1.4.2
87
github.com/metal-stack/metal-go v0.40.4
98
github.com/metal-stack/metal-lib v0.20.2
@@ -47,6 +46,7 @@ require (
4746
github.com/docker/docker v28.0.2+incompatible // indirect
4847
github.com/docker/go-connections v0.5.0 // indirect
4948
github.com/docker/go-units v0.5.0 // indirect
49+
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
5050
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
5151
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
5252
github.com/fatih/color v1.18.0 // indirect

test/e2e/frmwrk/config/capi-e2e-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ variables:
157157
KUBERNETES_IMAGE_UPGRADE_TO: "capms-ubuntu-1.34.1"
158158
# TODO: remove once merged into upstream
159159
# https://github.com/kubernetes-sigs/cluster-api/pull/12948
160-
KUBETEST_CONFIGURATION: "/home/vknabel/dev/ms/cluster-api-provider-metal-stack/test/e2e/frmwrk/data/kubetest/conformance.yaml"
160+
KUBETEST_CONFIGURATION: "test/e2e/frmwrk/data/kubetest/conformance.yaml" # must be absolute, actual path provided by Makefile
161161

162162
intervals:
163163
default/wait-controllers: ["4m", "10s"]

0 commit comments

Comments
 (0)