X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=deploy%2Fsite%2Fvm%2Fvm.sh;h=882a8bda26532bee7c5fcd6da6b1ed3e63ebdf15;hb=c910d76976e8c2698a7895a2f95f46f55fc0c73d;hp=8dcc35900114da4cca27081c325fa03ee65ec880;hpb=f67da3090f4e3632f5bf162d21ec832a9211ff1b;p=icn.git diff --git a/deploy/site/vm/vm.sh b/deploy/site/vm/vm.sh index 8dcc359..882a8bd 100755 --- a/deploy/site/vm/vm.sh +++ b/deploy/site/vm/vm.sh @@ -23,7 +23,7 @@ function release_name { } function deploy { - for values in build/site/vm/machine-*-values.yaml; do + for values in ${BUILDDIR}/machine-*-values.yaml; do helm -n metal3 install $(release_name ${values}) ${SCRIPTDIR}/../../machine --create-namespace -f ${values} done helm -n metal3 install cluster-e2etest ${SCRIPTDIR}/../../cluster --create-namespace -f ${BUILDDIR}/cluster-e2etest-values.yaml @@ -31,7 +31,7 @@ function deploy { function clean { helm -n metal3 uninstall cluster-e2etest - for values in build/site/vm/machine-*-values.yaml; do + for values in ${BUILDDIR}/machine-*-values.yaml; do helm -n metal3 uninstall $(release_name ${values}) done } @@ -50,6 +50,7 @@ function is_control_plane_ready { function wait_for_all_ready { WAIT_FOR_INTERVAL=60s + WAIT_FOR_TRIES=30 wait_for is_cluster_ready clusterctl -n metal3 get kubeconfig e2etest >${BUILDDIR}/e2etest-admin.conf chmod 600 ${BUILDDIR}/e2etest-admin.conf