Merge "Fix file permissions on pod11.sh"

[icn.git] / deploy / kata / kata.sh

diff --git a/deploy/kata/kata.sh b/deploy/kata/kata.sh
index 0cc3b86..967a891 100755 (executable)
--- a/deploy/kata/kata.sh
+++ b/deploy/kata/kata.sh
@@ -37,6 +37,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 +78,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