run local-release after checkout

Author: Rahul Sharma

Makefile

@@ -159,29 +159,34 @@ test: generate fmt vet envtest ## Run tests.
 e2etest: generate local-release local-deploy chainsaw s5cmd
 	GIT_REF=$(GIT_REF) SSE_KEY=$$(openssl rand -base64 32) LOCALBIN=$(CACHE_BIN) $(CHAINSAW) test ./e2e --selector $(E2E_SELECTOR) $(E2E_FLAGS)
 
-local-deploy: kind ctlptl tilt kustomize clusterctl
-	$(CTLPTL) apply -f .tilt/ctlptl-config.yaml
+.PHONY: local-deploy
+local-deploy: kind-cluster tilt kustomize clusterctl
 	$(TILT) ci -f Tiltfile
 
+.PHONY: kind-cluster
+kind-cluster: kind ctlptl
+	$(CTLPTL) apply -f .tilt/ctlptl-config.yaml
+
 ##@ Test Upgrade:
 
 LATEST_REF         := $(shell git rev-parse --short HEAD)
 LAST_RELEASE       := $(shell git describe --abbrev=0 --tags)
 COMMON_CLUSTER_REF := $(shell echo "up-$(LATEST_REF)" | cut -c1-8)
 
-.PHONY: last-release-cluster
-last-release-cluster: kind ctlptl tilt kustomize clusterctl chainsaw local-release
-	$(CTLPTL) apply -f .tilt/ctlptl-config.yaml
-	git checkout $(LAST_RELEASE)
-	$(TILT) ci -f Tiltfile
-	GIT_REF=$(COMMON_CLUSTER_REF) LOCALBIN=$(CACHE_BIN) CLUSTERCTL_CONFIG=$(CLUSTERCTL_CONFIG) $(CHAINSAW) test ./e2e/capl-cluster-flavors/kubeadm-capl-cluster
-
 .PHONY: checkout-latest-commit
 checkout-latest-commit:
 	git checkout $(LATEST_REF)
 
+.PHONY: checkout-last-release
+checkout-last-release:
+	git checkout $(LAST_RELEASE)
+
+.PHONY: last-release-cluster
+last-release-cluster: kind ctlptl tilt kustomize clusterctl chainsaw kind-cluster checkout-last-release local-release local-deploy
+	GIT_REF=$(COMMON_CLUSTER_REF) LOCALBIN=$(CACHE_BIN) CLUSTERCTL_CONFIG=$(CLUSTERCTL_CONFIG) $(CHAINSAW) test ./e2e/capl-cluster-flavors/kubeadm-capl-cluster
+
 .PHONY: test-upgrade
-test-upgrade: last-release-cluster checkout-latest-commit local-deploy local-release
+test-upgrade: last-release-cluster checkout-latest-commit local-release local-deploy
 	GIT_REF=$(COMMON_CLUSTER_REF) LOCALBIN=$(CACHE_BIN) CLUSTERCTL_CONFIG=$(CLUSTERCTL_CONFIG) $(CHAINSAW) test ./e2e/capl-cluster-flavors/kubeadm-capl-cluster
 
 .PHONY: clean-kind-cluster

e2e/kind-config.yaml

@@ -3,7 +3,7 @@ apiVersion: kind.x-k8s.io/v1alpha4
 name: e2e
 nodes:
 - role: control-plane
-  image: kindest/node:v1.31.0
+  image: kindest/node:v1.28.0
   extraPortMappings:
   - containerPort: 8080
     hostPort: 28080