diff --git a/Makefile b/Makefile index a2faea4b5b4..a1683bda3f6 100644 --- a/Makefile +++ b/Makefile @@ -135,7 +135,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 diff --git a/actor/versioncheck/minimum_version_check.go b/actor/versioncheck/minimum_version_check.go index 535d8acbd52..031caacd6d4 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 3369b1cbd83..3549f055b1a 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"