Merge pull request #5787 from willie-yao/custom-manager-image

Add make test target for custom manager image

Author: k8s-ci-robot

e2e.mk

@@ -39,3 +39,13 @@ test-e2e-skip-build-and-push:
 	$(MAKE) set-manifest-pull-policy TARGET_RESOURCE="./config/capz/manager_pull_policy.yaml" PULL_POLICY=IfNotPresent
 	MANAGER_IMAGE=$(CONTROLLER_IMG)-$(ARCH):$(TAG) \
 	$(MAKE) test-e2e-run
+
+.PHONY: test-e2e-custom-image
+test-e2e-custom-image: ## Run e2e tests with a custom image format (use MANAGER_IMAGE env var).
+	@if [ -z "$(MANAGER_IMAGE)" ]; then \
+		echo "MANAGER_IMAGE must be set"; \
+		exit 1; \
+	fi
+	$(MAKE) set-manifest-image MANIFEST_IMG=$(shell echo $(MANAGER_IMAGE) | cut -d: -f1) MANIFEST_TAG=$(shell echo $(MANAGER_IMAGE) | cut -d: -f2) TARGET_RESOURCE="./config/capz/manager_image_patch.yaml"
+	$(MAKE) set-manifest-pull-policy TARGET_RESOURCE="./config/capz/manager_pull_policy.yaml" PULL_POLICY=IfNotPresent
+	$(MAKE) test-e2e-run

scripts/ci-e2e.sh

@@ -82,7 +82,14 @@ trap capz::ci-e2e::cleanup EXIT
 # Image is configured as `${CONTROLLER_IMG}-${ARCH}:${TAG}` where `CONTROLLER_IMG` is defaulted to `${REGISTRY}/${IMAGE_NAME}`.
 if [[ "${BUILD_MANAGER_IMAGE}" == "false" ]]; then
   # Load an existing image, skip docker-build and docker-push.
-  make test-e2e-skip-build-and-push
+  if [[ -n "${CUSTOM_MANAGER_IMAGE:-}" ]]; then
+    # Use custom image format when CUSTOM_MANAGER_IMAGE is set
+    export MANAGER_IMAGE="${CUSTOM_MANAGER_IMAGE}"
+    make test-e2e-custom-image
+  else
+    # Use default image format
+    make test-e2e-skip-build-and-push
+  fi
 elif [[ "${USE_LOCAL_KIND_REGISTRY}" == "true" ]]; then
   # Build an image with kind local registry, skip docker-push. REGISTRY is set to `localhost:5000/ci-e2e`. TAG is set to `$(date -u '+%Y%m%d%H%M%S')`.
   make test-e2e-skip-push