Merge pull request #66061 from cofyc/prefer_using_process_environments

Automatic merge from submit-queue (batch tested with PRs 66410, 66398, 66061, 66397, 65558). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Passing `KUBE_TEST_ARGS` variable to make through process environment instead of command line flags **What this PR does / why we need it**: Passing `KUBE_TEST_ARGS` variable to make through process environment instead of command line flags. `$` character has special meaning in `make`, if `KUBE_TEST_ARGS` contains `$`, it cannot be passed to `make test`. Actually, we can simply pass variables to make through process environment. This makes following scenario to work: ``` export KUBE_TEST_ARGS='-run ^TestVolumeBinding$' make test-integration WHAT=./test/integration/scheduler ``` **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #66061 from cofyc/prefer_using_process_environments
0bf74270 · Kubernetes Submit Queue · GitHub · 35ff6ea2 · fda0edcd · 0bf74270
Unverified Commit 0bf74270 authored Jul 20, 2018 by Kubernetes Submit Queue Committed by GitHub Jul 20, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

test-integration.sh hack/make-rules/test-integration.sh +4 -2

No files found.
--- a/hack/make-rules/test-integration.sh
+++ b/hack/make-rules/test-integration.sh
@@ -68,10 +68,12 @@ runTests() {
  kube::log::status "Running integration test cases"

  KUBE_RACE="-race"
-  make -C "${KUBE_ROOT}" test \
+  # KUBE_TEST_ARGS may contain '$' character which has special meaning in make,
+  # pass it through process environment instead.
+  KUBE_TEST_ARGS="${KUBE_TEST_ARGS:-} ${SHORT:--short=true} --vmodule=${KUBE_TEST_VMODULE} --alsologtostderr=true" \
+    make -C "${KUBE_ROOT}" test \
      WHAT="${WHAT:-$(kube::test::find_integration_test_dirs | paste -sd' ' -)}" \
      GOFLAGS="${GOFLAGS:-}" \
-      KUBE_TEST_ARGS="${KUBE_TEST_ARGS:-} ${SHORT:--short=true} --vmodule=${KUBE_TEST_VMODULE} --alsologtostderr=true" \
      KUBE_RACE="" \
      KUBE_TIMEOUT="${KUBE_TIMEOUT}" \
      KUBE_TEST_API_VERSIONS="$1"