Skip to content

Commit 708b1f3

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request kubernetes#37446 from CaoShuFeng/test-integration
Automatic merge from submit-queue (batch tested with PRs 37208, 37446, 37420) Move "-short" to KUBE_TEST_ARGS fixes kubernetes#37445 **Release note**: <!-- Steps to write your release note: 1. Use the release-note-* labels to set the release note state (if you have access) 2. Enter your extended release note in the below block; leaving it blank means using the PR title as the release note. If no release note is required, just write `NONE`. --> ```release-note NONE ``` "-short" is a argument of "go test", it should be moved to "KUBE_TEST_ARGS".
2 parents 3888ea7 + 9c01e87 commit 708b1f3

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

hack/make-rules/test-integration.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ runTests() {
6262
# KUBE_RACE="-race"
6363
make -C "${KUBE_ROOT}" test \
6464
WHAT="$(kube::test::find_integration_test_dirs ${2-} | paste -sd' ' -) $(echo ${@:3})" \
65-
KUBE_GOFLAGS="${KUBE_GOFLAGS:-} ${SHORT:--short=true} -tags 'integration no-docker'" \
66-
KUBE_TEST_ARGS="${KUBE_TEST_ARGS:-} --vmodule=garbage*collector*=6 --alsologtostderr=true" \
65+
KUBE_GOFLAGS="${KUBE_GOFLAGS:-} -tags 'integration no-docker'" \
66+
KUBE_TEST_ARGS="${KUBE_TEST_ARGS:-} ${SHORT:--short=true} --vmodule=garbage*collector*=6 --alsologtostderr=true" \
6767
KUBE_RACE="" \
6868
KUBE_TIMEOUT="${KUBE_TIMEOUT}" \
6969
KUBE_TEST_API_VERSIONS="$1"

0 commit comments

Comments
 (0)