From dea77f4dc6d5671f92acf8628745dbd096740b62 Mon Sep 17 00:00:00 2001
From: Hristo Hristov <me@hhristov.info>
Date: Fri, 3 Apr 2026 16:26:29 +0300
Subject: [PATCH] feat: add e2e-minishift Makefile target and workflow job

Signed-off-by: Hristo Hristov <me@hhristov.info>
---
 .github/workflows/e2e.yml | 17 +++--------------
 Makefile                  | 17 ++++++++++++++++-
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 83b9d78a..729c268b 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -65,8 +65,8 @@ jobs:
 
       - name: e2e (Enterprise)
         run: sudo KUBERNETES_SUPPORTED_VERSION=${{ matrix.k8s-version }} make e2e
-  e2e-minishift:
-    name: E2E Testing (Minishift)
+  e2e-openshift:
+    name: E2E Testing (MINC)
     runs-on: ubuntu-latest-8-cores
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -79,16 +79,5 @@ jobs:
 
       - uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4
 
-      - name: Install MINC
-        run: |
-          curl -L -o minc  https://github.com/minc-org/minc/releases/latest/download/minc_linux_amd64
-          chmod +x ./minc
-
-      - name: Start Minishift
-        run: |
-          ./minc config set provider docker
-          ./minc create --log-level debug
-          ./minc status
-
       - name: e2e
-        run: sudo make e2e
+        run: sudo make e2e-openshift
diff --git a/Makefile b/Makefile
index 53ea036c..86a64c53 100644
--- a/Makefile
+++ b/Makefile
@@ -345,7 +345,15 @@ golint: golangci-lint
 golint-fix: golangci-lint
 	$(GOLANGCI_LINT) run -c .golangci.yaml --verbose --fix
 
-
+.PHONY: e2e-openshift
+e2e-openshift: ginkgo
+	$(MAKE) e2e-build-openshift && $(MAKE) e2e-exec && $(MAKE) e2e-destroy-openshift
+e2e-build-openshift: minc
+	$(MINC) config set provider docker
+	$(MINC) create
+	$(MINC) status
+e2e-destroy-openshift: minc
+	$(MINC) delete
 # Running e2e tests in a KinD instance
 .PHONY: e2e
 e2e: ginkgo
@@ -472,6 +480,13 @@ ct:
 	@test -s $(CT) && $(CT) version | grep -q $(CT_VERSION) || \
 	$(call go-install-tool,$(CT),github.com/$(CT_LOOKUP)/v3/ct@$(CT_VERSION))
 
+MINC:= $(LOCALBIN)/minc
+MINC_VERSION := v0.1.0
+MINC_LOOKUP  := minc-org/minc
+minc:
+	echo "Installing minc to $(MINC)" && \
+	$(call go-install-tool,$(MINC),github.com/$(MINC_LOOKUP)/cmd/minc@$(MINC_VERSION))
+
 KIND         := $(LOCALBIN)/kind
 KIND_VERSION := v0.31.0
 KIND_LOOKUP  := kubernetes-sigs/kind