Skip to content

Commit 7128032

Browse files
🌱 Drop integration tests (#2919)
* Drop integration tests * Fix go mod
1 parent 1d3ba99 commit 7128032

File tree

7 files changed

+2
-1230
lines changed

7 files changed

+2
-1230
lines changed

β€ŽMakefileβ€Ž

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ GINKGO_TIMEOUT ?= 3h
8484
E2E_CONF_FILE ?= $(abspath test/e2e/config/vsphere.yaml)
8585
E2E_CONF_OVERRIDE_FILE ?= $(abspath test/e2e/config/config-overrides.yaml)
8686
E2E_IPAM_KUBECONFIG ?=
87-
INTEGRATION_CONF_FILE ?= $(abspath test/integration/integration-dev.yaml)
8887
E2E_TEMPLATE_DIR := $(abspath test/e2e/data/)
8988
E2E_GOVMOMI_TEMPLATE_DIR := $(E2E_TEMPLATE_DIR)/infrastructure-vsphere-govmomi
9089
E2E_SUPERVISOR_TEMPLATE_DIR := $(E2E_TEMPLATE_DIR)/infrastructure-vsphere-supervisor
@@ -257,7 +256,6 @@ LDFLAGS ?= $(shell hack/version.sh)
257256
MANIFEST_ROOT ?= ./config
258257
CRD_ROOT ?= $(MANIFEST_ROOT)/default/crd/bases
259258
SUPERVISOR_CRD_ROOT ?= $(MANIFEST_ROOT)/supervisor/crd
260-
VMOP_CRD_ROOT ?= $(MANIFEST_ROOT)/deployments/integration-tests/crds
261259
VCSIM_CRD_ROOT ?= $(VCSIM_DIR)/config/crd/bases
262260
WEBHOOK_ROOT ?= $(MANIFEST_ROOT)/webhook
263261
RBAC_ROOT ?= $(MANIFEST_ROOT)/rbac
@@ -283,7 +281,7 @@ generate: ## Run all generate targets
283281

284282
.PHONY: generate-manifests
285283
generate-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
606594
e2e-images: ## Build the e2e manager image
607595
# please ensure the generated image name matches image names used in the E2E_CONF_FILE;

β€Žtest/go.modβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ replace sigs.k8s.io/cluster-api-provider-vsphere => ../
1010

1111
require (
1212
github.com/dougm/pretty v0.0.0-20171025230240-2ee9d7453c02
13-
github.com/google/uuid v1.6.0
1413
github.com/onsi/ginkgo/v2 v2.17.1
1514
github.com/onsi/gomega v1.32.0
1615
github.com/pkg/errors v0.9.1
@@ -85,6 +84,7 @@ require (
8584
github.com/google/gofuzz v1.2.0 // indirect
8685
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
8786
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
87+
github.com/google/uuid v1.6.0 // indirect
8888
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
8989
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
9090
github.com/hashicorp/hcl v1.0.0 // indirect

β€Žtest/integration/cluster_lifecycle_test.goβ€Ž

Lines changed: 0 additions & 184 deletions
This file was deleted.

β€Žtest/integration/data/shared/metadata.yamlβ€Ž

Lines changed: 0 additions & 14 deletions
This file was deleted.

β€Žtest/integration/integration-dev.yamlβ€Ž

Lines changed: 0 additions & 91 deletions
This file was deleted.

0 commit comments

Comments
Β (0)