X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=deploy%2Fkata%2Fkata.sh;h=187e539371c8eb6cdf75f09a4b9e5222495dd955;hb=8fcb874a6e5ec52b4a6ac80cb7f34c7baccd8c17;hp=ec3ade4af21921f623d549d6e8a2cafa9cc366ac;hpb=4493016bf98a7fd5bd18397bd70adbdc6d084c6f;p=icn.git

diff --git a/deploy/kata/kata.sh b/deploy/kata/kata.sh
index ec3ade4..187e539 100755
--- a/deploy/kata/kata.sh
+++ b/deploy/kata/kata.sh
@@ -64,17 +64,27 @@ function clean_webhook {
     kustomize build ${BUILDDIR}/webhook/base | KUBECONFIG=${cluster_kubeconfig} kubectl delete -f -
 }
 
+function is_kata_deployed {
+    local -r cluster_name=${CLUSTER_NAME:-icn}
+    local -r cluster_kubeconfig="${BUILDDIR}/${cluster_name}.conf"
+    kubectl --kubeconfig=${cluster_kubeconfig} get runtimeclass/kata-qemu
+}
+
 function test_kata {
     # Create a temporary kubeconfig file for the tests
-    local -r cluster_name=${CLUSTER_NAME:-e2etest}
+    local -r cluster_name=${CLUSTER_NAME:-icn}
     local -r cluster_kubeconfig="${BUILDDIR}/${cluster_name}.conf"
     clusterctl -n metal3 get kubeconfig ${cluster_name} >${cluster_kubeconfig}
 
+    # Ensure that Kata has been deployed first
+    WAIT_FOR_TRIES=30
+    wait_for is_kata_deployed
+
     deploy_webhook ${cluster_name}
     clone_kud_repository
     pushd ${KUDPATH}/kud/tests
     failed_kud_tests=""
-    KUBECONFIG=${cluster_kubeconfig} bash kata.sh || failed_kud_tests="${failed_kud_tests} ${test}"
+    KUBECONFIG=${cluster_kubeconfig} bash kata.sh || failed_kud_tests="${failed_kud_tests} kata"
     popd
     clean_webhook ${cluster_name}
     if [[ ! -z "$failed_kud_tests" ]]; then
@@ -93,7 +103,7 @@ case $1 in
 Usage: $(basename $0) COMMAND
 
 The "test" command looks for the CLUSTER_NAME variable in the
-environment (default: "e2etest").  This should be the name of the
+environment (default: "icn").  This should be the name of the
 Cluster resource to execute the tests in.
 
 Commands: