wip of running e2e tests locally 3

Author: nawazkh

Makefile

@@ -723,8 +723,8 @@ test-cover: test ## Run tests with code coverage and generate reports.
 	./hack/codecov-ignore.sh
 	go tool cover -html=coverage.out -o coverage.html
 
-.PHONY: kind-create-bootstrap
-kind-create-bootstrap: $(KUBECTL) ## Create capz kind bootstrap cluster.
+.PHONY: create-bootstrap
+create-bootstrap: $(KUBECTL) ## Create capz kind bootstrap cluster.
 	if [ "$(MGMT_CLUSTER_TYPE)" == "aks" ]; then \
 		MGMT_CLUSTER_NAME=capz-e2e \
 		AKS_RESOURCE_GROUP=capz-e2e \

e2e.mk

@@ -5,8 +5,10 @@
 
 ##@ E2E Testing:
 .PHONY: test-e2e-run
-test-e2e-run: generate-e2e-templates install-tools kind-create-bootstrap ## Run e2e tests.
-	@source ./scripts/peer-vnets.sh && source_tilt_settings tilt-settings.yaml; \
+test-e2e-run: generate-e2e-templates install-tools create-bootstrap ## Run e2e tests.
+	if [ "$(MGMT_CLUSTER_TYPE)" == "aks" ]; then \
+		source ./scripts/peer-vnets.sh && source_tilt_settings tilt-settings.yaml; \
+	fi; \
 	$(ENVSUBST) < $(E2E_CONF_FILE) > $(E2E_CONF_FILE_ENVSUBST) && \
 	if [ -z "${AZURE_CLIENT_ID_USER_ASSIGNED_IDENTITY}" ]; then \
 		export AZURE_CLIENT_ID_USER_ASSIGNED_IDENTITY=$(shell cat $(AZURE_IDENTITY_ID_FILEPATH)); \
@@ -19,21 +21,32 @@ test-e2e-run: generate-e2e-templates install-tools kind-create-bootstrap ## Run
 	$(MAKE) cleanup-workload-identity
 	$(MAKE) clean-release-git
 
+
 .PHONY: test-e2e
 test-e2e: ## Run "docker-build" and "docker-push" rules then run e2e tests.
-	PULL_POLICY=IfNotPresent MANAGER_IMAGE=$(CONTROLLER_IMG)-$(ARCH):$(TAG) \
+	# $$ARCH is set to amd64 for aks cluster type
+	if [ "$(MGMT_CLUSTER_TYPE)" = "aks" ]; then \
+  		export ARCH=amd64; \
+	fi; \
+	PULL_POLICY=IfNotPresent MANAGER_IMAGE=$(CONTROLLER_IMG)-$$ARCH:$(TAG) \
 	$(MAKE) docker-build docker-push \
 	test-e2e-run
 
 .PHONY: test-e2e-skip-push
 test-e2e-skip-push: ## Run "docker-build" rule then run e2e tests.
-	PULL_POLICY=IfNotPresent MANAGER_IMAGE=$(CONTROLLER_IMG)-$(ARCH):$(TAG) \
+	if [ "$(MGMT_CLUSTER_TYPE)" = "aks" ]; then \
+		export ARCH=amd64; \
+	fi; \
+	PULL_POLICY=IfNotPresent MANAGER_IMAGE=$(CONTROLLER_IMG)-$$ARCH:$(TAG) \
 	$(MAKE) docker-build \
 	test-e2e-run
 
 .PHONY: test-e2e-skip-build-and-push
 test-e2e-skip-build-and-push:
-	$(MAKE) set-manifest-image MANIFEST_IMG=$(CONTROLLER_IMG)-$(ARCH) MANIFEST_TAG=$(TAG) TARGET_RESOURCE="./config/capz/manager_image_patch.yaml"
-	$(MAKE) set-manifest-pull-policy TARGET_RESOURCE="./config/capz/manager_pull_policy.yaml" PULL_POLICY=IfNotPresent
-	MANAGER_IMAGE=$(CONTROLLER_IMG)-$(ARCH):$(TAG) \
+	if [ "$(MGMT_CLUSTER_TYPE)" = "aks" ]; then \
+		export ARCH=amd64; \
+	fi; \
+	$(MAKE) set-manifest-image MANIFEST_IMG=$(CONTROLLER_IMG)-$$ARCH MANIFEST_TAG=$(TAG) TARGET_RESOURCE="./config/capz/manager_image_patch.yaml" \
+	$(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

scripts/ci-e2e.sh

@@ -79,11 +79,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.
+  echo "running make test-e2e-skip-build-and-push"
   make test-e2e-skip-build-and-push
 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')`.
+  echo "running make test-e2e-skip-push"
   make test-e2e-skip-push
 else
   # Build an image and push to the registry. TAG is set to `$(date -u '+%Y%m%d%H%M%S')`.
+  echo "running make test-e2e"
   make test-e2e
 fi

test/e2e/azure_apiserver_ilb.go

@@ -466,4 +466,15 @@ func AzureAPIServerILBSpec(ctx context.Context, inputGetter func() AzureAPIServe
 func PeerVnets(ctx context.Context, inputGetter func() AzureAPIServerILBSpecInput) {
 	// TODO: shall I have this shell commands in this func instead ?
 	Logf("In PeerVnets func")
+
+	// shell commands
+	cmd := exec.Command("bash", "-c", "source ./scripts/peer-vnets.sh && peer_vnets")
+
+	output, err := cmd.CombinedOutput()
+	if err != nil {
+		return fmt.Errorf("failed to invoke shell function: %w\nOutput: %s", err, string(output))
+	}
+
+	fmt.Println(string(output))
+
 }