Skip to content

Commit 9f66823

Browse files
joshjmsk8s-infra-cherrypick-robot
authored andcommitted
fix: test-release
Address reviews in #19815 Signed-off-by: joshjms <[email protected]>
1 parent 9e9ed6b commit 9f66823

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ test-e2e-release: build
5656

5757
.PHONY: test-release
5858
test-release:
59-
PASSES="release_tests" CI=$$CI ./scripts/test.sh $(GO_TEST_FLAGS)
59+
PASSES="release_tests" ./scripts/test.sh $(GO_TEST_FLAGS)
6060

6161
.PHONY: test-robustness
6262
test-robustness:

scripts/test.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,10 @@ function release_pass {
602602
}
603603

604604
function release_tests_pass {
605-
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"}')
605+
if [ -z "${VERSION:-}" ]; then
606+
VERSION=$(go list -m go.etcd.io/etcd/api/v3 2>/dev/null | \
607+
awk '{split(substr($2,2), a, "."); print a[1]"."a[2]".99"}')
608+
fi
606609

607610
if [ -n "${CI:-}" ]; then
608611
git config user.email "[email protected]"

0 commit comments

Comments
 (0)