run cases.sh on kind in CI

This patch runs the cases.sh test cases in CI on a locally
deployed kind cluster.

Signed-off-by: Nathan Skrzypczak <[email protected]>

Author: sknat

.ci/buildspec.yml

@@ -32,13 +32,21 @@ phases:
       - make clean-vpp
       - make images
 
+      # run linting and go tests
       - make mdlint
       - make ci-lint
       - make ci-test
       - make ci-cov
 
+      # Publish image, even if they are not fine
+      # as this helps reproducing
       - make push
 
+      # Run integration tests (kind & e2e)
+      - make kind
+      - make test-e2e
+      - make kind-rm-cluster
+
   post_build:
     commands:
       - echo Build completed on `date`

Makefile

@@ -181,6 +181,18 @@ restart-calicovpp:
 	kubectl -n calico-vpp-dataplane rollout restart ds/calico-vpp-node
 	kubectl -n calico-vpp-dataplane rollout status ds/calico-vpp-node
 
+# Make sure we are running against a kind cluster, as the tests will
+# try to break dataplane
+.PHONY: validate-kind
+validate-kind:
+	test -n "$(shell kubectl config current-context | grep '^kind-')" || test -n "$(FORCE)"
+
+# test-e2e run repo local end to end test of calico VPP,
+# making sure basic connectivity, DNS and services work
+# This requires a running cluser. e.g. 'make kind'
+.PHONY: test-e2e
+test-e2e: validate-kind run-tests run-tests-v6 restart-calicovpp
+
 .PHONY: goapi
 export VPP_DIR ?= $(shell pwd)/vpp-manager/vpp_build
 goapi:
@@ -236,10 +248,6 @@ release: check-TAG check-CALICO_TAG
 	@echo "Calico version \"v3.27.0\", the directory would be \"calico_versioned_docs/version-3.27\". If this is not done,"
 	@echo "the install docs get broken!!"
 
-.PHONY: run-integration-tests
-run-integration-tests:
-	$(MAKE) -C test/integration-tests $@
-
 .PHONY: test-memif-multinet
 test-memif-multinet:
 	kubectl apply -f test/yaml/multinet/network.yaml

common.mk

@@ -56,3 +56,4 @@ ifeq (${CODEBUILD_WEBHOOK_TRIGGER},branch/master)
 endif
 
 CLUSTER_NAME ?= kind-$(shell whoami)-$(shell git describe --always --abbrev=4)
+KIND ?= go run sigs.k8s.io/[email protected]

test/kind/Makefile

@@ -9,13 +9,14 @@ DEBUG ?= false
 
 .PHONY: new-cluster
 new-cluster:
-	@N_KIND_WORKERS=$(N_KIND_WORKERS) \
+	N_KIND_WORKERS=$(N_KIND_WORKERS) \
 		N_KIND_CONTROL_PLANES=$(N_KIND_CONTROL_PLANES) \
 		CPU_PINNING=$(CPU_PINNING) \
 		CLUSTER_NAME=$(CLUSTER_NAME) \
+		KIND="$(KIND)" \
 		./new_cluster.sh
 	mkdir -p $(HOME)/.kube
-	kind get kubeconfig --name $(CLUSTER_NAME) > $(HOME)/.kube/config
+	$(KIND) get kubeconfig --name $(CLUSTER_NAME) > $(HOME)/.kube/config
 
 .PHONY: install-cni
 install-cni:
@@ -24,7 +25,7 @@ install-cni:
 
 .PHONY: rm-cluster
 rm-cluster:
-	kind delete cluster --name $(CLUSTER_NAME)
+	$(KIND) delete cluster --name $(CLUSTER_NAME)
 
 .PHONY: dev
 dev:

test/kind/new_cluster.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -o errexit
 
-if [[ $(kind get clusters | grep -E '^'${CLUSTER_NAME}'$') == "${CLUSTER_NAME}" ]]; then
+if [[ $(${KIND} get clusters | grep -E '^'${CLUSTER_NAME}'$') == "${CLUSTER_NAME}" ]]; then
 	echo "Cluster kind already exists"
 	exit 0
 fi
@@ -88,7 +88,7 @@ fi
 done
 # use cpuSet in the case of a patched kind version like in scale tests (test/scale/README.md)
 
-echo -e "$config" | kind create cluster --config=-
+echo -e "$config" | ${KIND} create cluster --config=-
 
 # connect the registry to the cluster network if not already connected
 if [ "$(docker inspect -f='{{json .NetworkSettings.Networks.kind}}' "${reg_name}")" = 'null' ]; then