X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=deploy%2Fkud%2Fkud_bm_launch.sh;h=7fa0c256bebd8c63bd8d906154c4e77f5cc33af9;hb=c3ca1c962a355e4e17e5ebd4067716bbea39e6bb;hp=c19b0bdb4c0fcfec78a4abd0b65089a7c3c2d544;hpb=ec966951c55b36d3cbe5964303862dc0865d6603;p=icn.git

diff --git a/deploy/kud/kud_bm_launch.sh b/deploy/kud/kud_bm_launch.sh
index c19b0bd..7fa0c25 100755
--- a/deploy/kud/kud_bm_launch.sh
+++ b/deploy/kud/kud_bm_launch.sh
@@ -1,10 +1,12 @@
-#!/bin/bash
-set +x
+#!/usr/bin/env bash
+set -eu -o pipefail
 
 LIBDIR="$(dirname "$(dirname "$PWD")")"
 
 source $LIBDIR/env/lib/common.sh
 
+export KUBESPRAY_VERSION=2.14.1
+
 function get_kud_repo {
     if [ -d $DOWNLOAD_PATH/multicloud-k8s ]; then
         rm -rf $DOWNLOAD_PATH/multicloud-k8s
@@ -12,7 +14,12 @@ function get_kud_repo {
 
     mkdir -p $DOWNLOAD_PATH
     pushd $DOWNLOAD_PATH
-    git clone https://github.com/onap/multicloud-k8s.git
+    if [ "$1" == "v1" ] ; then
+        export KUD_ADDONS=multus
+        git clone https://github.com/onap/multicloud-k8s.git
+    else
+        git clone https://github.com/onap/multicloud-k8s.git
+    fi
     popd
 }
 
@@ -33,7 +40,7 @@ function set_bm_kud {
     pushd $DOWNLOAD_PATH/multicloud-k8s/kud/hosting_providers/vagrant/inventory
     HOST_IP=${HOST_IP:-$(hostname -I | cut -d ' ' -f 1)}
     if [ "$1" == "minimal" ] ; then
-    cat <<EOL > hosts.ini
+        cat <<EOL > hosts.ini
 [all]
 $HOSTNAME ansible_ssh_host=${HOST_IP} ansible_ssh_port=22
 
@@ -51,7 +58,7 @@ kube-node
 kube-master
 EOL
     else
-    cat <<EOL > hosts.ini
+        cat <<EOL > hosts.ini
 [all]
 $HOSTNAME ansible_ssh_host=${HOST_IP} ansible_ssh_port=22
 
@@ -83,28 +90,31 @@ EOL
 
 function kud_install {
     pushd $DOWNLOAD_PATH/multicloud-k8s/kud/hosting_providers/vagrant/
-    if [ "$1" == "all" ]; then
+    if [ "$1" == "all" -o "$1" == "vm" ]; then
         sed -i -e 's/testing_enabled=${KUD_ENABLE_TESTS:-false}/testing_enabled=${KUD_ENABLE_TESTS:-true}/g' installer.sh
     fi
+    if [ "$1" == "vm" ]; then
+        sed -i -e 's/^kube_pods_subnet.*/kube_pods_subnet: 172.21.64.0\/18/g' inventory/group_vars/k8s-cluster.yml
+    fi
     ./installer.sh | tee kud_deploy.log
 
     if [ "$1" == "bm" ]; then
-        pushd $DOWNLOAD_PATH/multicloud-k8s/kud/tests/
-            sleep 15
-            bash sriov.sh
-        popd
+        for addon in ${KUD_ADDONS:-multus ovn4nfv nfd sriov qat cmk optane}; do
+            pushd $DOWNLOAD_PATH/multicloud-k8s/kud/tests/
+                bash ${addon}.sh
+            popd
+        done
     fi
     popd
 }
 
 function kud_reset {
     pushd $DOWNLOAD_PATH/multicloud-k8s/kud/hosting_providers/vagrant/
-    ansible-playbook -i inventory/hosts.ini /opt/kubespray-2.10.4/reset.yml \
+    ansible-playbook -i inventory/hosts.ini /opt/kubespray-${KUBESPRAY_VERSION}/reset.yml \
         --become --become-user=root -e reset_confirmation=yes
     popd
 }
 
-
 function verifier {
     APISERVER=$(kubectl config view --minify -o \
                     jsonpath='{.clusters[0].cluster.server}')
@@ -120,7 +130,7 @@ if [ "$1" == "reset" ] ; then
     exit 0
 fi
 
-get_kud_repo
+get_kud_repo $2
 set_ssh_key
 set_bm_kud $1
 kud_install $1