fix: test-release checks

Address reviews in #19815

This is a cherrypick of c940bf5
PR: #19848

Signed-off-by: joshjms <[email protected]>

Author: joshjms

Makefile

@@ -168,7 +168,7 @@ test-e2e-release:
 
 .PHONY: test-release
 test-release:
-	PASSES="release_tests" VERSION="3.4.99" CI=$$CI ./scripts/test.sh $(GO_TEST_FLAGS)
+	PASSES="release_tests" VERSION="3.4.99" ./test $(GO_TEST_FLAGS)
 
 docker-test:
 	$(info GO_VERSION: $(GO_VERSION))

test

@@ -399,7 +399,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]"
@@ -419,8 +422,8 @@ EOF
     	git remote add origin https://github.com/etcd-io/etcd.git
   	fi
 
-	DRY_RUN=true run "./scripts/release.sh" --no-upload --no-docker-push --no-gh-release --in-place "${VERSION}"
-	VERSION="${VERSION}" run "./scripts/test_images.sh"
+	DRY_RUN=true "./scripts/release.sh" --no-upload --no-docker-push --no-gh-release --in-place "${VERSION}"
+	VERSION="${VERSION}" "./scripts/test_images.sh"
 }
 
 function shellcheck_pass {