Run all k8s unit tests

openshift · Jun 15, 2017 · edf68d8 · edf68d8
1 parent ba69e24
commit edf68d8
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/hack/test-go.sh b/hack/test-go.sh
@@ -135,11 +135,9 @@ if [[ -n "${package_args}" ]]; then
 else
     # If no packages are given to test, we need to generate a list of all packages with unit tests
     openshift_test_packages="$(list_test_packages_under '*')"
+    test_packages="${openshift_test_packages}"
 
     kubernetes_path="vendor/k8s.io/kubernetes"
-    mandatory_kubernetes_packages="./vendor/k8s.io/kubernetes/pkg/api ./vendor/k8s.io/kubernetes/pkg/api/v1"
-
-    test_packages="${openshift_test_packages} ${mandatory_kubernetes_packages}"
 
     if [[ -n "${test_kube}" ]]; then
         # we need to find all of the kubernetes test suites, excluding those we directly whitelisted before, the end-to-end suite, and
@@ -148,8 +146,6 @@ else
         optional_kubernetes_packages="$(find -L vendor/k8s.io/{apimachinery,apiserver,client-go,kube-aggregator,kubernetes} -not \( \
           \(                                                                                          \
             -path "${kubernetes_path}/staging"                                                        \
-            -o -path "${kubernetes_path}/pkg/api"                                                     \
-            -o -path "${kubernetes_path}/pkg/api/v1"                                                  \
             -o -path "${kubernetes_path}/test"                                                        \
             -o -path "${kubernetes_path}/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned" \
             -o -path "${kubernetes_path}/pkg/storage/etcd3"                                           \
@@ -158,6 +154,8 @@ else
         \) -name '*_test.go' | cut -f 2- -d / | xargs -n1 dirname | sort -u | xargs -n1 printf "./vendor/%s\n")"
 
         test_packages="${test_packages} ${optional_kubernetes_packages}"
+    else
+        test_packages="${test_packages} ./vendor/k8s.io/kubernetes/pkg/api/... ./vendor/k8s.io/kubernetes/pkg/apis/..."
     fi
 fi