From 4c34895e0a6119f23c82497e7199bf010117a9c1 Mon Sep 17 00:00:00 2001 From: Andy Goldstein Date: Wed, 9 Jan 2019 14:58:26 -0500 Subject: [PATCH] int tests: stop special casing KUBE_TEST_ARGS Stop special casing KUBE_TEST_ARGS and limiting the API group/version settings to "v1" when running the tests. This was helpful in the past when we used to test multiple values for KUBE_TEST_API_VERSIONS - if you were specifying KUBE_TEST_ARGS to run a single test case, you probably didn't want to have it tested for multiple values of KUBE_TEST_API_VERSIONS. Now, however, KUBE_TEST_API_VERSIONS comes from KUBE_AVAILABLE_GROUP_VERSIONS by default, which is a single list instead of multiple, so we shouldn't need to special case KUBE_TEST_ARGS any more. This is especially necessary because certain tests that are using testapi break if KUBE_TEST_API_VERSIONS is just "v1". Signed-off-by: Andy Goldstein --- hack/make-rules/test-integration.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/hack/make-rules/test-integration.sh b/hack/make-rules/test-integration.sh index b69124df07c..47ef4937801 100755 --- a/hack/make-rules/test-integration.sh +++ b/hack/make-rules/test-integration.sh @@ -93,12 +93,6 @@ checkEtcdOnPath # Run cleanup to stop etcd on interrupt or other kill signal. trap cleanup EXIT -# If a test case is specified, just run once with v1 API version and exit -if [[ -n "${KUBE_TEST_ARGS}" ]]; then - runTests v1 - exit 0 -fi - # Convert the CSV to an array of API versions to test IFS=';' read -a apiVersions <<< "${KUBE_TEST_API_VERSIONS}" for apiVersion in "${apiVersions[@]}"; do