Fix CI

Makefile

@@ -80,9 +80,9 @@ GINKGO_SKIP ?=
 GINKGO_NODES ?= 1
 GINKGO_TIMEOUT ?= 3h
 E2E_CONF_FILE ?= $(abspath test/e2e/config/vsphere.yaml)
+E2E_CONF_OVERRIDES ?= $(abspath test/e2e/config/byo-overrides.yaml)
 E2E_CAPV_MODE ?= govimomi
 E2E_TARGET_TYPE ?= vcenter
-E2E_BYO_CONF_OVERRIDES ?= $(abspath test/e2e/config/byo-overrides.yaml)
 E2E_IPAM_KUBECONFIG ?=
 INTEGRATION_CONF_FILE ?= $(abspath test/integration/integration-dev.yaml)
 E2E_TEMPLATE_DIR := $(abspath test/e2e/data/infrastructure-vsphere/)
@@ -532,12 +532,12 @@ e2e: $(GINKGO) $(KUSTOMIZE) $(KIND) $(GOVC) ## Run e2e tests
 	time $(GINKGO) -v --trace -focus="$(GINKGO_FOCUS)" $(_SKIP_ARGS) --nodes=$(GINKGO_NODES) -timeout=$(GINKGO_TIMEOUT) \
 		--output-dir="$(ARTIFACTS)" --junit-report="junit.e2e_suite.1.xml" ./test/e2e -- \
 		--e2e.config="$(E2E_CONF_FILE)" \
+		--e2e.config-overrides="$(E2E_CONF_OVERRIDES)" \
 		--e2e.artifacts-folder="$(ARTIFACTS)" \
 		--e2e.skip-resource-cleanup=$(SKIP_RESOURCE_CLEANUP) \
 		--e2e.use-existing-cluster="$(USE_EXISTING_CLUSTER)" \
 		--e2e.capv-mode="$(E2E_CAPV_MODE)" \
 		--e2e.target-type="$(E2E_TARGET_TYPE)" \
-		--e2e.byo-config-overrides="$(E2E_BYO_CONF_OVERRIDES)" \
 		--e2e.ipam-kubeconfig="$(E2E_IPAM_KUBECONFIG)"
 
 ## --------------------------------------

hack/e2e.sh

@@ -53,6 +53,7 @@ export VSPHERE_PASSWORD="${GOVC_PASSWORD}"
 export VSPHERE_SSH_AUTHORIZED_KEY="${VM_SSH_PUB_KEY}"
 export VSPHERE_SSH_PRIVATE_KEY="/root/ssh/.private-key/private-key"
 export E2E_CONF_FILE="${REPO_ROOT}/test/e2e/config/vsphere.yaml"
+export E2E_CONF_OVERRIDES=""
 export E2E_CAPV_MODE="${CAPV_MODE:-govimomi}"
 export E2E_TARGET_TYPE="${TARGET_TYPE:-vmc}"
 export ARTIFACTS="${ARTIFACTS:-${REPO_ROOT}/_artifacts}"