@@ -84,7 +84,6 @@ GINKGO_TIMEOUT ?= 3h
8484E2E_CONF_FILE ?= $(abspath test/e2e/config/vsphere.yaml)
8585E2E_CONF_OVERRIDE_FILE ?= $(abspath test/e2e/config/config-overrides.yaml)
8686E2E_IPAM_KUBECONFIG ?=
87- INTEGRATION_CONF_FILE ?= $(abspath test/integration/integration-dev.yaml)
8887E2E_TEMPLATE_DIR := $(abspath test/e2e/data/)
8988E2E_GOVMOMI_TEMPLATE_DIR := $(E2E_TEMPLATE_DIR ) /infrastructure-vsphere-govmomi
9089E2E_SUPERVISOR_TEMPLATE_DIR := $(E2E_TEMPLATE_DIR ) /infrastructure-vsphere-supervisor
@@ -257,7 +256,6 @@ LDFLAGS ?= $(shell hack/version.sh)
257256MANIFEST_ROOT ?= ./config
258257CRD_ROOT ?= $(MANIFEST_ROOT ) /default/crd/bases
259258SUPERVISOR_CRD_ROOT ?= $(MANIFEST_ROOT ) /supervisor/crd
260- VMOP_CRD_ROOT ?= $(MANIFEST_ROOT ) /deployments/integration-tests/crds
261259VCSIM_CRD_ROOT ?= $(VCSIM_DIR ) /config/crd/bases
262260WEBHOOK_ROOT ?= $(MANIFEST_ROOT ) /webhook
263261RBAC_ROOT ?= $(MANIFEST_ROOT ) /rbac
@@ -283,7 +281,7 @@ generate: ## Run all generate targets
283281
284282.PHONY : generate-manifests
285283generate-manifests : $(CONTROLLER_GEN ) # # Generate manifests e.g. CRD, RBAC etc.
286- $(MAKE ) clean-generated-yaml SRC_DIRS=" $( CRD_ROOT) ,$( SUPERVISOR_CRD_ROOT) ,$( VMOP_CRD_ROOT ) , ./config/webhook/manifests.yaml"
284+ $(MAKE ) clean-generated-yaml SRC_DIRS=" $( CRD_ROOT) ,$( SUPERVISOR_CRD_ROOT) ,./config/webhook/manifests.yaml"
287285 $(CONTROLLER_GEN ) \
288286 paths=./apis/v1alpha3 \
289287 paths=./apis/v1alpha4 \
@@ -302,11 +300,6 @@ generate-manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc.
302300 paths=./apis/vmware/v1beta1 \
303301 crd:crdVersions=v1 \
304302 output:crd:dir=$(SUPERVISOR_CRD_ROOT )
305- # vm-operator crds are used for test.
306- $(CONTROLLER_GEN ) \
307- paths=github.com/vmware-tanzu/vm-operator/api/v1alpha1/... \
308- crd:crdVersions=v1 \
309- output:crd:dir=$(VMOP_CRD_ROOT )
310303 # net-operator is used for tests
311304 $(CONTROLLER_GEN ) \
312305 paths=./$(NETOP_DIR ) /controllers/... \
@@ -597,11 +590,6 @@ test-cover: ## Run unit tests and generate a coverage report
597590 go tool cover -func=coverage.out -o coverage.txt
598591 go tool cover -html=coverage.out -o coverage.html
599592
600- .PHONY : test-integration
601- test-integration : e2e-images # # Run integration tests
602- test-integration : $(GINKGO ) $(KUSTOMIZE ) $(KIND )
603- time $(GINKGO ) --output-dir=" $( ARTIFACTS) " --junit-report=" junit.integration_suite.1.xml" -v ./test/integration -- --config=$(INTEGRATION_CONF_FILE ) --artifacts-folder=" $( ARTIFACTS) "
604-
605593.PHONY : e2e-images
606594e2e-images : # # Build the e2e manager image
607595 # please ensure the generated image name matches image names used in the E2E_CONF_FILE;
0 commit comments