X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=deploy%2Fkata%2Fkata.sh;h=39aa8ee03145f3ba33c9d72257b7b711c1935903;hb=b13f5643b2c17bca79fce39612f8c8c87158632a;hp=0cc3b862fb670e0d03894360911395bf2357208c;hpb=7d9a147be328eb6fa90d64ef845635d506601d12;p=icn.git

diff --git a/deploy/kata/kata.sh b/deploy/kata/kata.sh
index 0cc3b86..39aa8ee 100755
--- a/deploy/kata/kata.sh
+++ b/deploy/kata/kata.sh
@@ -10,9 +10,6 @@ source $LIBDIR/common.sh
 BUILDDIR=${SCRIPTDIR/deploy/build}
 mkdir -p ${BUILDDIR}
 
-KATA_VERSION="2.1.0-rc0"
-KATA_WEBHOOK_VERSION="2.1.0-rc0"
-
 KATA_DEPLOY_URL="https://raw.githubusercontent.com/kata-containers/kata-containers/${KATA_VERSION}/tools/packaging/kata-deploy"
 KATA_WEBHOOK_URL="https://raw.githubusercontent.com/kata-containers/tests/${KATA_WEBHOOK_VERSION}/kata-webhook"
 KATA_WEBHOOK_DIR="/opt/src/kata_webhook"
@@ -25,6 +22,7 @@ function build_source {
     curl -sL ${KATA_DEPLOY_URL}/kata-rbac/base/kata-rbac.yaml -o ${SCRIPTDIR}/base/kata-rbac.yaml
     curl -sL ${KATA_DEPLOY_URL}/kata-deploy/base/kata-deploy.yaml -o ${SCRIPTDIR}/base/kata-deploy.yaml
     curl -sL ${KATA_DEPLOY_URL}/runtimeclasses/kata-runtimeClasses.yaml -o ${SCRIPTDIR}/base/kata-runtimeClasses.yaml
+    rm -f ${SCRIPTDIR}/base/kustomization.yaml
     pushd ${SCRIPTDIR}/base && kustomize create --autodetect && popd
 }
 
@@ -37,6 +35,7 @@ function deploy_webhook {
     # create-certs.sh takes care of converting the .yaml.tpl into the
     # .yaml file
     mkdir -p ${BUILDDIR}/webhook/base/deploy
+    curl -sL ${KATA_WEBHOOK_URL}/common.bash -o ${BUILDDIR}/webhook/base/common.bash
     curl -sL ${KATA_WEBHOOK_URL}/create-certs.sh -o ${BUILDDIR}/webhook/base/create-certs.sh
     curl -sL ${KATA_WEBHOOK_URL}/deploy/webhook-registration.yaml.tpl -o ${BUILDDIR}/webhook/base/deploy/webhook-registration.yaml.tpl
     curl -sL ${KATA_WEBHOOK_URL}/deploy/webhook.yaml -o ${BUILDDIR}/webhook/base/deploy/webhook.yaml
@@ -77,13 +76,14 @@ function test_kata {
     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