Skip to content

Commit

Permalink
🌱 Drop integration tests (#2919)
Browse files Browse the repository at this point in the history
* Drop integration tests

* Fix go mod
  • Loading branch information
fabriziopandini authored Apr 18, 2024
1 parent 1d3ba99 commit 7128032
Show file tree
Hide file tree
Showing 7 changed files with 2 additions and 1,230 deletions.
14 changes: 1 addition & 13 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ GINKGO_TIMEOUT ?= 3h
E2E_CONF_FILE ?= $(abspath test/e2e/config/vsphere.yaml)
E2E_CONF_OVERRIDE_FILE ?= $(abspath test/e2e/config/config-overrides.yaml)
E2E_IPAM_KUBECONFIG ?=
INTEGRATION_CONF_FILE ?= $(abspath test/integration/integration-dev.yaml)
E2E_TEMPLATE_DIR := $(abspath test/e2e/data/)
E2E_GOVMOMI_TEMPLATE_DIR := $(E2E_TEMPLATE_DIR)/infrastructure-vsphere-govmomi
E2E_SUPERVISOR_TEMPLATE_DIR := $(E2E_TEMPLATE_DIR)/infrastructure-vsphere-supervisor
Expand Down Expand Up @@ -257,7 +256,6 @@ LDFLAGS ?= $(shell hack/version.sh)
MANIFEST_ROOT ?= ./config
CRD_ROOT ?= $(MANIFEST_ROOT)/default/crd/bases
SUPERVISOR_CRD_ROOT ?= $(MANIFEST_ROOT)/supervisor/crd
VMOP_CRD_ROOT ?= $(MANIFEST_ROOT)/deployments/integration-tests/crds
VCSIM_CRD_ROOT ?= $(VCSIM_DIR)/config/crd/bases
WEBHOOK_ROOT ?= $(MANIFEST_ROOT)/webhook
RBAC_ROOT ?= $(MANIFEST_ROOT)/rbac
Expand All @@ -283,7 +281,7 @@ generate: ## Run all generate targets

.PHONY: generate-manifests
generate-manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc.
$(MAKE) clean-generated-yaml SRC_DIRS="$(CRD_ROOT),$(SUPERVISOR_CRD_ROOT),$(VMOP_CRD_ROOT),./config/webhook/manifests.yaml"
$(MAKE) clean-generated-yaml SRC_DIRS="$(CRD_ROOT),$(SUPERVISOR_CRD_ROOT),./config/webhook/manifests.yaml"
$(CONTROLLER_GEN) \
paths=./apis/v1alpha3 \
paths=./apis/v1alpha4 \
Expand All @@ -302,11 +300,6 @@ generate-manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc.
paths=./apis/vmware/v1beta1 \
crd:crdVersions=v1 \
output:crd:dir=$(SUPERVISOR_CRD_ROOT)
# vm-operator crds are used for test.
$(CONTROLLER_GEN) \
paths=github.com/vmware-tanzu/vm-operator/api/v1alpha1/... \
crd:crdVersions=v1 \
output:crd:dir=$(VMOP_CRD_ROOT)
# net-operator is used for tests
$(CONTROLLER_GEN) \
paths=./$(NETOP_DIR)/controllers/... \
Expand Down Expand Up @@ -597,11 +590,6 @@ test-cover: ## Run unit tests and generate a coverage report
go tool cover -func=coverage.out -o coverage.txt
go tool cover -html=coverage.out -o coverage.html

.PHONY: test-integration
test-integration: e2e-images ## Run integration tests
test-integration: $(GINKGO) $(KUSTOMIZE) $(KIND)
time $(GINKGO) --output-dir="$(ARTIFACTS)" --junit-report="junit.integration_suite.1.xml" -v ./test/integration -- --config=$(INTEGRATION_CONF_FILE) --artifacts-folder="$(ARTIFACTS)"

.PHONY: e2e-images
e2e-images: ## Build the e2e manager image
# please ensure the generated image name matches image names used in the E2E_CONF_FILE;
Expand Down
2 changes: 1 addition & 1 deletion test/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ replace sigs.k8s.io/cluster-api-provider-vsphere => ../

require (
github.com/dougm/pretty v0.0.0-20171025230240-2ee9d7453c02
github.com/google/uuid v1.6.0
github.com/onsi/ginkgo/v2 v2.17.1
github.com/onsi/gomega v1.32.0
github.com/pkg/errors v0.9.1
Expand Down Expand Up @@ -85,6 +84,7 @@ require (
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
Expand Down
184 changes: 0 additions & 184 deletions test/integration/cluster_lifecycle_test.go

This file was deleted.

14 changes: 0 additions & 14 deletions test/integration/data/shared/metadata.yaml

This file was deleted.

91 changes: 0 additions & 91 deletions test/integration/integration-dev.yaml

This file was deleted.

Loading

0 comments on commit 7128032

Please sign in to comment.