Code Review
/
icn.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Move SOPS test key to its own directory
[icn.git]
/
deploy
/
kata
/
kata.sh
diff --git
a/deploy/kata/kata.sh
b/deploy/kata/kata.sh
index
ec3ade4
..
187e539
100755
(executable)
--- 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 -
}
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
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}
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=""
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
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
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:
Cluster resource to execute the tests in.
Commands: