adding bm launch

Signed-off-by: r.kuralamudhan <kuralamudhan.ramakrishnan@intel.com>
Change-Id: Ie3d1676121898bc1fc313f19d455706f30675d7f

diff --git a/Makefile b/Makefile
index cb5b6f1..3fca41b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,10 @@ clean_packages:
        pushd $(BOOTLOADER_ENV) && \
        ./02_clean_bootloader_package_req.sh --only-packages && popd
 
+clean_bm_packages:
+       pushd $(BOOTLOADER_ENV) && \
+        ./02_clean_bootloader_package_req.sh --bm-cleanall && popd
+
 bmh_install:
        source user_config.sh && env && \
        pushd $(METAL3DIR) && ./01_metal3.sh launch && \
@@ -61,6 +65,9 @@ kud_bm_deploy_mini:
 kud_bm_deploy:
        pushd $(KUD_PATH) && ./kud_bm_launch.sh all && popd
 
+kud_bm_deploy_e2e:
+       pushd $(KUD_PATH) && ./kud_bm_launch.sh bm && popd
+
 kud_bm_reset:
        pushd $(KUD_PATH) && ./kud_bm_launch.sh reset && popd
 
@@ -141,8 +148,10 @@ verify_nestedk8s: prerequisite \
        sdwan_verifier
 
 bm_verify_nestedk8s: prerequisite \
-       kud_bm_deploy \
-       sdwan_verifier
+        kud_bm_deploy_e2e \
+        sdwan_verifier \
+        kud_bm_reset \
+       clean_bm_packages
 
 .PHONY: all bm_preinstall bm_install bashate
 

diff --git a/deploy/kud/kud_bm_launch.sh b/deploy/kud/kud_bm_launch.sh
index 60784c4..c19b0bd 100755 (executable)
--- a/deploy/kud/kud_bm_launch.sh
+++ b/deploy/kud/kud_bm_launch.sh
@@ -87,6 +87,13 @@ function kud_install {
         sed -i -e 's/testing_enabled=${KUD_ENABLE_TESTS:-false}/testing_enabled=${KUD_ENABLE_TESTS:-true}/g' installer.sh
     fi
     ./installer.sh | tee kud_deploy.log
+
+    if [ "$1" == "bm" ]; then
+        pushd $DOWNLOAD_PATH/multicloud-k8s/kud/tests/
+            sleep 15
+            bash sriov.sh
+        popd
+    fi
     popd
 }
 

diff --git a/env/ubuntu/bootloader-env/02_clean_bootloader_package_req.sh b/env/ubuntu/bootloader-env/02_clean_bootloader_package_req.sh
index ff4c00b..8557328 100755 (executable)
--- a/env/ubuntu/bootloader-env/02_clean_bootloader_package_req.sh
+++ b/env/ubuntu/bootloader-env/02_clean_bootloader_package_req.sh
@@ -9,11 +9,6 @@ if [[ $EUID -ne 0 ]]; then
     exit 1
 fi
 
-if [[ $(lsb_release -d | cut -f2) != $UBUNTU_BIONIC ]]; then
-    echo "Currently Ubuntu 18.04.2 LTS is only supported"
-    exit 1
-fi
-
 function autoremove {
     #apt-get autoremove -y
     rm -rf /etc/apt/sources.list.d/*
@@ -90,6 +85,22 @@ EOF'
     apt-get remove kubelet kubeadm kubectl -y
 }
 
+function clean_all {
+    apt-get remove -y openvswitch-switch openvswitch-common ovn-central \
+        ovn-common ovn-host
+    rm -rf /var/run/openvswitch
+    rm -rf /var/lib/openvswitch
+    rm -rf /var/log/openvswitch
+    apt-get purge -y libvirt*
+    rm -rf /var/lib/libvirt
+    rm -rf /etc/libvirt
+    rm -rf /var/lib/virtlet
+    rm -rf /var/run/libvirt
+    rm -rf virtlet.sock
+    rm -rf virtlet-diag.sock
+    rm -rf criproxy.sock
+}
+
 function clean_apt_cache {
     shopt -s extglob
     pushd /var/cache/apt/archives
@@ -135,6 +146,12 @@ if [ "$1" == "--only-packages" ]; then
     exit 0
 fi
 
+if [ "$1" == "--bm-cleanall" ]; then
+    clean_all
+    autoremove
+    exit 0
+fi
+
 check_prerequisite
 clean_apt_cache
 check_dir $LOCAL_APT_REPO