Merge pull request #24626 from nikhiljindal/kubeapiversions

Automatic merge from submit-queue Removing KUBE_API_VERSIONS from our test scripts We dont need to specify them. Its an unnecessary extra change that people have to make while adding a group. We also need this change for ubernetes. cc @caesarxuchao @jianhuiz

Merge pull request #24626 from nikhiljindal/kubeapiversions
945daaae · k8s-merge-robot · 2e9bcb83 · 75b08423 · 945daaae · 945daaae
Commit 945daaae authored Apr 22, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 9 deletions

test-cmd.sh hack/test-cmd.sh +2 -2

test-go.sh hack/test-go.sh +2 -4

test-integration.sh hack/test-integration.sh +2 -3

No files found.
--- a/hack/test-cmd.sh
+++ b/hack/test-cmd.sh
@@ -183,7 +183,7 @@ kube::log::status "Starting kube-apiserver"
 # Admission Controllers to invoke prior to persisting objects in cluster
 ADMISSION_CONTROL="NamespaceLifecycle,LimitRanger,ResourceQuota"
-KUBE_API_VERSIONS="v1,autoscaling/v1,batch/v1,apps/v1alpha1,extensions/v1beta1" "${KUBE_OUTPUT_HOSTBIN}/kube-apiserver" \
+"${KUBE_OUTPUT_HOSTBIN}/kube-apiserver" \
  --address="127.0.0.1" \
  --public-address-override="127.0.0.1" \
  --port="${API_PORT}" \
@@ -1792,6 +1792,6 @@ __EOF__
  kube::test::clear_all
 }
-KUBE_API_VERSIONS="v1,autoscaling/v1,batch/v1,apps/v1alpha1,extensions/v1beta1" runTests "v1"
+runTests "v1"
 kube::log::status "TEST PASSED"
--- a/hack/test-go.sh
+++ b/hack/test-go.sh
@@ -323,10 +323,8 @@ for (( i=0, j=0; ; )); do
  apiVersion=${apiVersions[i]}
  etcdPrefix=${etcdPrefixes[j]}
  echo "Running tests for APIVersion: $apiVersion with etcdPrefix: $etcdPrefix"
-  # KUBE_TEST_API sets the version of each group to be tested. KUBE_API_VERSIONS
+  # KUBE_TEST_API sets the version of each group to be tested.
-  # register the groups/versions as supported by k8s. So KUBE_API_VERSIONS
+  KUBE_TEST_API="${apiVersion}" ETCD_PREFIX=${etcdPrefix} runTests "$@"
-  # needs to be the superset of KUBE_TEST_API.
-  KUBE_TEST_API="${apiVersion}" KUBE_API_VERSIONS="v1,autoscaling/v1,batch/v1,extensions/v1beta1,componentconfig/v1alpha1,metrics/v1alpha1,apps/v1alpha1,authorization.k8s.io/v1beta1" ETCD_PREFIX=${etcdPrefix} runTests "$@"
  i=${i}+1
  j=${j}+1
  if [[ i -eq ${apiVersionsCount} ]] && [[ j -eq ${etcdPrefixesCount} ]]; then

--- a/hack/test-integration.sh
+++ b/hack/test-integration.sh
@@ -52,11 +52,10 @@ runTests() {
    KUBE_RACE="" \
    KUBE_TIMEOUT="${KUBE_TIMEOUT}" \
    KUBE_TEST_API_VERSIONS="$1" \
-    KUBE_API_VERSIONS="v1,autoscaling/v1,batch/v1,apps/v1alpha1,extensions/v1beta1" \
    "${KUBE_ROOT}/hack/test-go.sh" test/integration
  kube::log::status "Running integration test scenario with watch cache on"
-  KUBE_API_VERSIONS="v1,autoscaling/v1,batch/v1,apps/v1alpha1,extensions/v1beta1" KUBE_TEST_API_VERSIONS="$1" "${KUBE_OUTPUT_HOSTBIN}/integration" --v=${LOG_LEVEL} \
+  KUBE_TEST_API_VERSIONS="$1" "${KUBE_OUTPUT_HOSTBIN}/integration" --v=${LOG_LEVEL} \
    --max-concurrency="${KUBE_INTEGRATION_TEST_MAX_CONCURRENCY}" --watch-cache=true
  cleanup
@@ -73,7 +72,7 @@ checkEtcdOnPath() {
 checkEtcdOnPath
-KUBE_API_VERSIONS="v1,autoscaling/v1,batch/v1,apps/v1alpha1,extensions/v1beta1" "${KUBE_ROOT}/hack/build-go.sh" "$@" cmd/integration
+"${KUBE_ROOT}/hack/build-go.sh" "$@" cmd/integration
 # Run cleanup to stop etcd on interrupt or other kill signal.
 trap cleanup EXIT