diff --git a/test/test_utils.sh b/test/test_utils.sh index 4d6c8be9..51199cde 100755 --- a/test/test_utils.sh +++ b/test/test_utils.sh @@ -154,10 +154,7 @@ build_fission_cli() { popd } -clean_tpr_crd_resources() { - # clean tpr & crd resources to avoid testing error (ex. no kind "HttptriggerList" is registered for version "fission.io/v1") - # thirdpartyresources part should be removed after kubernetes test cluster is upgrade to 1.8+ - kubectl --namespace default get thirdpartyresources| grep -v NAME| grep "fission.io"| awk '{print $1}'|xargs -I@ bash -c "kubectl --namespace default delete thirdpartyresources @" || true +clean_crd_resources() { kubectl --namespace default get crd| grep -v NAME| grep "fission.io"| awk '{print $1}'|xargs -I@ bash -c "kubectl --namespace default delete crd @" || true } @@ -504,7 +501,7 @@ install_and_test() { controllerPort=31234 routerPort=31235 - clean_tpr_crd_resources + clean_crd_resources id=$(generate_test_id) trap "helm_uninstall_fission $id" EXIT diff --git a/test/tests/test_obj_create_in_diff_ns.sh b/test/tests/test_obj_create_in_diff_ns.sh index 568e4f95..fcfa7a42 100755 --- a/test/tests/test_obj_create_in_diff_ns.sh +++ b/test/tests/test_obj_create_in_diff_ns.sh @@ -10,7 +10,7 @@ ROOT=$(dirname $0)/../.. final_cleanup() { rm -rf testDir1 || true - kubectl delete ns "ns1-$id" "ns2-$id" || true + kubectl delete ns "ns1-$id" "ns2-$id" & } cleanup() { @@ -272,4 +272,4 @@ main() { final_cleanup } -main \ No newline at end of file +main