Cleanup.

Author: Joshua Reed

Makefile

@@ -178,7 +178,7 @@ export KUBEBUILDER_ASSETS=$(PROJECT_DIR)/bin
 .PHONY: test
 test: generate-mocks lint bin/ginkgo bin/kubectl bin/kube-apiserver bin/etcd ## Run tests. At the moment this is only unit tests.
 	@# The following is a slightly funky way to make sure the ginkgo statements are removed regardless the test results.
-	@ginkgo_v2 --cover -coverprofile cover.out --covermode=atomic -v ./api/... ./controllers/... ./pkg/...; EXIT_STATUS=$$?;\
+	@ginkgo_v2 --label-filter="!integ" --cover -coverprofile cover.out --covermode=atomic -v ./api/... ./controllers/... ./pkg/...; EXIT_STATUS=$$?;\
 		./hack/testing_ginkgo_recover_statements.sh --remove; exit $$EXIT_STATUS
 
 .PHONY: generate-mocks

pkg/cloud/helpers_test.go

@@ -40,7 +40,6 @@ var _ = Describe("Helpers", func() {
 	Context("For a configuration with the 'Global' section missing", func() {
 		It("Gets API configuration", func() {
 			filepath := getConfigPath("cloud-config-no-global")
-			fmt.Println(filepath)
 
 			client, err := cloud.NewClient(filepath)
 

test/dummies/vars.go

@@ -15,6 +15,7 @@ import (
 	capiv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 )
 
+// GetYamlVal fetches the values in test/e2e/config/cloudstack.yaml by yaml node. A common config file.
 func GetYamlVal(variable string) string {
 	val, err := CSConf.Get("variables").Get(variable).String()
 	gomega.Ω(err).ShouldNot(gomega.HaveOccurred())
@@ -76,36 +77,6 @@ var ( // Declare exported dummy vars.
 	DiskOffering       capcv1.CloudStackResourceDiskOffering
 )
 
-// variables:
-//   KUBERNETES_VERSION_MANAGEMENT: "v1.20.10"
-//   KUBERNETES_VERSION: "v1.20.10"
-//   CNI: "./data/cni/kindnet.yaml"
-//   IP_FAMILY: "IPv4"
-//   NODE_DRAIN_TIMEOUT: "60s"
-
-//   CLOUDSTACK_ZONE_NAME: zone1
-//   CLOUDSTACK_INVALID_ZONE_NAME: zoneXXXX
-//   CLOUDSTACK_INVALID_NETWORK_NAME: networkXXXX
-//   CLOUDSTACK_ACCOUNT_NAME: admin
-//   CLOUDSTACK_INVALID_ACCOUNT_NAME: accountXXXX
-//   CLOUDSTACK_DOMAIN_NAME: ROOT
-//   CLOUDSTACK_INVALID_DOMAIN_NAME: domainXXXX
-//   CLOUDSTACK_NETWORK_NAME: isolated-for-e2e-1
-//   CLOUDSTACK_NEW_NETWORK_NAME: isolated-for-e2e-new
-//   CLOUDSTACK_SHARED_NETWORK_NAME: Shared1
-//   CLUSTER_ENDPOINT_IP: 172.16.2.199
-//   CLUSTER_ENDPOINT_IP_2: 172.16.2.198
-//   CLUSTER_ENDPOINT_NEW_IP: 172.16.2.201
-//   CLUSTER_ENDPOINT_PORT: 6443
-//   CLUSTER_ENDPOINT_PORT_2: 6443
-//   CLOUDSTACK_CONTROL_PLANE_MACHINE_OFFERING: "Large Instance"
-//   CLOUDSTACK_INVALID_CONTROL_PLANE_MACHINE_OFFERING: "OfferingXXXX"
-//   CLOUDSTACK_EXTREMELY_LARGE_CONTROL_PLANE_MACHINE_OFFERING: "Extremely Large Instance"
-//   CLOUDSTACK_WORKER_MACHINE_OFFERING: "Medium Instance"
-//   CLOUDSTACK_TEMPLATE_NAME: kube-v1.20.10/ubuntu-2004
-//   CLOUDSTACK_INVALID_TEMPLATE_NAME: templateXXXX
-//   CLOUDSTACK_SSH_KEY_NAME: CAPCKeyPair6
-
 // SetDummyVars sets/resets all dummy vars.
 func SetDummyVars() {
 	projDir := os.Getenv("PROJECT_DIR")