From c6c279f25784c0a7b8740cb3d1493831d03398de Mon Sep 17 00:00:00 2001
From: Prem Kumar Kalle <prem.kalle@broadcom.com>
Date: Mon, 15 Jun 2026 15:27:15 -0700
Subject: [PATCH 1/2] Fix(ci): add flake-attempts to client-creds integration
 test target

---
 Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 253ef761b7..4f68fc1cf9 100644
--- a/Makefile
+++ b/Makefile
@@ -133,7 +133,13 @@ integration-selfcontained: build install-test-deps
 
 integration-tests: build integration-cleanup integration-isolated integration-push integration-global integration-selfcontained ## Run all isolated, push, selfcontained, and global integration tests
 
-integration-tests-ci-client-creds: build integration-cleanup integration-push integration-global integration-selfcontained
+integration-tests-ci-client-creds: build install-test-deps integration-cleanup
+	$(ginkgo_int) -nodes $(NODES) -flake-attempts $(FLAKE_ATTEMPTS) \
+		integration/v7/push
+	$(ginkgo_int) -flake-attempts $(FLAKE_ATTEMPTS) \
+		integration/shared/global integration/v7/global
+	$(ginkgo_int) -nodes $(NODES) -flake-attempts $(FLAKE_ATTEMPTS) \
+		integration/v7/selfcontained
 
 i: integration-tests-full
 integration-full-tests: integration-tests-full

From c63698a6c2b0addbdad7e3a39b37368cc0697836 Mon Sep 17 00:00:00 2001
From: Prem Kumar Kalle <prem.kalle@broadcom.com>
Date: Mon, 15 Jun 2026 15:27:21 -0700
Subject: [PATCH 2/2] Fix: prevent 'cf apps' failure on empty API version

---
 actor/versioncheck/minimum_version_check.go      |  3 +++
 actor/versioncheck/minimum_version_check_test.go | 11 +++++++++++
 2 files changed, 14 insertions(+)

diff --git a/actor/versioncheck/minimum_version_check.go b/actor/versioncheck/minimum_version_check.go
index 535d8acbd5..031caacd6d 100644
--- a/actor/versioncheck/minimum_version_check.go
+++ b/actor/versioncheck/minimum_version_check.go
@@ -8,6 +8,9 @@ func IsMinimumAPIVersionMet(current string, minimum string) (bool, error) {
 	if minimum == "" {
 		return true, nil
 	}
+	if current == "" {
+		return false, nil
+	}
 
 	currentSemver, err := semver.Make(current)
 	if err != nil {
diff --git a/actor/versioncheck/minimum_version_check_test.go b/actor/versioncheck/minimum_version_check_test.go
index 3f4743e3fc..81bab28dce 100644
--- a/actor/versioncheck/minimum_version_check_test.go
+++ b/actor/versioncheck/minimum_version_check_test.go
@@ -56,6 +56,17 @@ var _ = Describe("IsMinimumAPIVersionMet", func() {
 		})
 	})
 
+	Context("current version is empty", func() {
+		BeforeEach(func() {
+			currentVersion = ""
+		})
+
+		It("returns false with no errors", func() {
+			Expect(minAPIVersionMet).To(Equal(false))
+			Expect(executeErr).ToNot(HaveOccurred())
+		})
+	})
+
 	Context("current version is less than min", func() {
 		BeforeEach(func() {
 			currentVersion = "3.22.0"