refactor: backport repo layout-aware targets for VPP kube-test

Backport Makefile targets and kube-test manifest to `release/v3.32.0`.

After the unify images and flatten repo layout refactoring, VPP kube-test
delegates CalicoVPP repo layout details to generic make targets so it can
work with both the old split-image releases (upto `release/v3.32.0`) as
well as the new unified image releases (`release/v3.33.0` onwards).

- `make vpp` delegates to vpp-manager and passes `VPP_DIR`/`BASE`.
- `make kube-test-template` renders `yaml/generated/calico-vpp-kubetest.yaml`
  with old-layout values: `calicovpp/agent` and `vpp-manager/vpp_build`.
- `make kube-test-push-images` pulls, tags, and pushes the v3.32
  split images into the local kind registry.

Updated vpp-manager's `clone-vpp` target to honor `VPP_DIR` so top-level
`make vpp` target's override is used consistently throughout VPP build.

Also added new kube-test manifest `yaml/generated/calico-vpp-kubetest.yaml`.

This keeps VPP kube-test independent of CalicoVPP's internal repo layout
while preserving compatibility with v3.32 split-image releases.

Signed-off-by: Aritra Basu <aritrbas+gh@cisco.com>

Author: aritrbas

Makefile

@@ -25,6 +25,36 @@ image-kind: image
 		docker push localhost:5000/calicovpp/$$image ; \
 	done
 
+# vpp: build VPP from source. VPP_DIR overrides the default build location
+# (default: vpp-manager/vpp_build/). BASE overrides the VPP commit.
+.PHONY: vpp
+vpp:
+	$(MAKE) -C vpp-manager $@ VPP_DIR=$(VPP_DIR) BASE=$(BASE)
+
+# kube-test-template: emit a KinD manifest template for kube-test.
+# Bakes in repo layout-specific values (CALICOVPP_AGENT_IMAGE, VPP_BUILD_REL_PATH)
+# so that VPP kube-test does not need to know the repo layout.
+# Old layout: separate images, VPP build at vpp-manager/vpp_build/.
+.PHONY: kube-test-template
+kube-test-template:
+	@CALICOVPP_AGENT_IMAGE=calicovpp/agent VPP_BUILD_REL_PATH=vpp-manager/vpp_build \
+	  envsubst '$$CALICOVPP_AGENT_IMAGE $$VPP_BUILD_REL_PATH' \
+	  < yaml/generated/calico-vpp-kubetest.yaml
+
+# kube-test-push-images: pull this release's CalicoVPP images from docker.io and push
+# to localhost:5000 for kube-test consumption. Called by kube-test release-cluster flow.
+.PHONY: kube-test-push-images
+kube-test-push-images:
+	docker pull docker.io/calicovpp/agent:$(CALICOVPP_VERSION)
+	docker image tag docker.io/calicovpp/agent:$(CALICOVPP_VERSION) localhost:5000/calicovpp/agent:$(CALICOVPP_VERSION)
+	docker push localhost:5000/calicovpp/agent:$(CALICOVPP_VERSION)
+	docker pull docker.io/calicovpp/vpp:$(CALICOVPP_VERSION)
+	docker image tag docker.io/calicovpp/vpp:$(CALICOVPP_VERSION) localhost:5000/calicovpp/vpp:$(CALICOVPP_VERSION)
+	docker push localhost:5000/calicovpp/vpp:$(CALICOVPP_VERSION)
+	docker pull docker.io/calicovpp/multinet-monitor:$(CALICOVPP_VERSION)
+	docker image tag docker.io/calicovpp/multinet-monitor:$(CALICOVPP_VERSION) localhost:5000/calicovpp/multinet-monitor:$(CALICOVPP_VERSION)
+	docker push localhost:5000/calicovpp/multinet-monitor:$(CALICOVPP_VERSION)
+
 .PHONY: kind-cluster-name
 kind-cluster-name:
 	@echo $(CLUSTER_NAME)

vpp-manager/Makefile

@@ -154,7 +154,7 @@ clean: clean-vpp
 
 .PHONY: clone-vpp
 clone-vpp:
-	BASE=$(BASE) bash $(VPPLINK_DIR)/generated/vpp_clone_current.sh ./vpp_build
+	BASE=$(BASE) bash $(VPPLINK_DIR)/generated/vpp_clone_current.sh $(VPP_DIR)
 
 .PHONY: clean-vpp
 clean-vpp: