From f14cc7e931a860a80794295ae539e05891e6b3d0 Mon Sep 17 00:00:00 2001 From: "r.kuralamudhan" Date: Mon, 25 Nov 2019 09:34:36 +0000 Subject: [PATCH] adding clean up script for nested k8s Signed-off-by: r.kuralamudhan Change-Id: I3fd52194878415fa13e915d2095bd0a1c0914f8a --- Makefile | 4 +++- env/ubuntu/bootloader-env/02_clean_bootloader_package_req.sh | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 22bde16..d0e5b33 100644 --- 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 --- 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 { -- 2.16.6