From 5aad0006c102e47de67cd9c01c57abd443cb06d6 Mon Sep 17 00:00:00 2001 From: Kuralamudhan Ramakrishnan Date: Tue, 26 May 2020 21:47:08 +0000 Subject: [PATCH] Adding bm deploy all option Co-authored-by: Chen, Tingjie Signed-off-by: Kuralamudhan Ramakrishnan Change-Id: Ic37023f6f11adcd7188afe9690f85541e99fd996 --- Makefile | 2 +- env/ubuntu/bootloader-env/02_clean_bootloader_package_req.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d435c3a..00f73ff 100644 --- a/Makefile +++ b/Makefile @@ -166,7 +166,7 @@ verify_nestedk8s: prerequisite \ clean_bm_packages bm_verify_nestedk8s: prerequisite \ - kud_bm_deploy_e2e \ + kud_bm_deploy \ kud_bm_reset \ clean_bm_packages 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 a2130a0..9be06fc 100755 --- a/env/ubuntu/bootloader-env/02_clean_bootloader_package_req.sh +++ b/env/ubuntu/bootloader-env/02_clean_bootloader_package_req.sh @@ -99,8 +99,8 @@ function clean_all { systemctl disable kubelet systemctl disable dockershim systemctl disable criproxy - ip link delete virbr0-nic - ip link delete virbr0 + if ip link show | grep virbr0-nic > /dev/null; then ip link delete virbr0-nic; fi + if ip link show | grep virbr0 > /dev/null; then ip link delete virbr0; fi } function clean_apt_cache { -- 2.16.6