Merge pull request #19853 from k8s-infra-cherrypick-robot/cherry-pick-19848-to-release-3.6

[release-3.6] fix: test-release checks

Author: jmhbnz

Makefile

@@ -56,7 +56,7 @@ test-e2e-release: build
 
 .PHONY: test-release
 test-release:
-	PASSES="release_tests" CI=$$CI ./scripts/test.sh $(GO_TEST_FLAGS)
+	PASSES="release_tests" ./scripts/test.sh $(GO_TEST_FLAGS)
 
 .PHONY: test-robustness
 test-robustness:

scripts/test.sh

@@ -602,7 +602,10 @@ function release_pass {
 }
 
 function release_tests_pass {
-  VERSION=$(go list -m go.etcd.io/etcd/api/v3 2>/dev/null | awk '{split(substr($2,2), a, "."); print a[1]"."a[2]".99"}')
+  if [ -z "${VERSION:-}" ]; then
+    VERSION=$(go list -m go.etcd.io/etcd/api/v3 2>/dev/null | \
+     awk '{split(substr($2,2), a, "."); print a[1]"."a[2]".99"}')
+  fi
 
   if [ -n "${CI:-}" ]; then
     git config user.email "[email protected]"