X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=deploy%2Fsite%2Fvm%2Fvm.sh;h=1fd980ae0782ef84b1050d0a4d224ec8a82285e1;hb=26141fccdb4824f330e9fa1607f15f2a0048fb82;hp=2d89d17c46e3d897681c863213a7113fef59e719;hpb=b94a4a7a41fbc3d2ce5248cf036250f428413ae8;p=icn.git

diff --git a/deploy/site/vm/vm.sh b/deploy/site/vm/vm.sh
index 2d89d17..1fd980a 100755
--- a/deploy/site/vm/vm.sh
+++ b/deploy/site/vm/vm.sh
@@ -13,17 +13,27 @@ function build {
     SSH_AUTHORIZED_KEY=$(cat ${HOME}/.ssh/id_rsa.pub)
     # Use ! instead of usual / to avoid escaping / in
     # SSH_AUTHORIZED_KEY
-    sed -e 's!sshAuthorizedKey: .*!sshAuthorizedKey: '"${SSH_AUTHORIZED_KEY}"'!' ${SCRIPTDIR}/clusters-values.yaml >${BUILDDIR}/clusters-values.yaml
+    sed -e 's!sshAuthorizedKey: .*!sshAuthorizedKey: '"${SSH_AUTHORIZED_KEY}"'!' ${SCRIPTDIR}/cluster-e2etest-values.yaml >${BUILDDIR}/cluster-e2etest-values.yaml
+}
+
+function release_name {
+    local -r values_path=$1
+    name=$(basename ${values_path})
+    echo ${name%-values.yaml}
 }
 
 function deploy {
-    helm -n metal3 install machines ${SCRIPTDIR}/../../machines --create-namespace -f ${BUILDDIR}/machines-values.yaml
-    helm -n metal3 install clusters ${SCRIPTDIR}/../../clusters --create-namespace -f ${BUILDDIR}/clusters-values.yaml
+    for values in build/site/vm/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
 }
 
 function clean {
-    helm -n metal3 uninstall clusters
-    helm -n metal3 uninstall machines
+    helm -n metal3 uninstall cluster-e2etest
+    for values in build/site/vm/machine-*-values.yaml; do
+	helm -n metal3 uninstall $(release_name ${values})
+    done
 }
 
 function is_cluster_ready {
@@ -36,6 +46,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