adding clean up script for nested k8s

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

diff --git a/Makefile b/Makefile
index 22bde16..d0e5b33 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -154,7 +154,9 @@ verifier: verify_all
 verify_nestedk8s: prerequisite \
        kud_vm_deploy \
        sdwan_verifier \
-       bpa_op_virtletvm_verifier
+       bpa_op_virtletvm_verifier \
+       kud_bm_reset \
+       clean_bm_packages
 
 bm_verify_nestedk8s: prerequisite \
         kud_bm_deploy_e2e \

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 8557328..caea9db 100755 (executable)
--- a/env/ubuntu/bootloader-env/02_clean_bootloader_package_req.sh
+++ b/env/ubuntu/bootloader-env/02_clean_bootloader_package_req.sh
@@ -91,7 +91,6 @@ function clean_all {
     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
@@ -99,6 +98,13 @@ function clean_all {
     rm -rf virtlet.sock
     rm -rf virtlet-diag.sock
     rm -rf criproxy.sock
+    systemctl stop dockershim
+    systemctl stop criproxy
+    systemctl disable kubelet
+    systemctl disable dockershim
+    systemctl disable criproxy
+    ip link delete virbr0-nic
+    ip link delete virbr0
 }
 
 function clean_apt_cache {