X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=Makefile;h=00f73ff9e9ef442ef01d384d1bc2f45081733007;hb=9ecb9f4910e12487edf63b3790b72878dbef4f0e;hp=22bde16c7c963931ca95f228e66578c3508be7d8;hpb=6c64e47646e2fc21447b5a3ae3ff4fae9d556c0d;p=icn.git

diff --git a/Makefile b/Makefile
index 22bde16..00f73ff 100644
--- a/Makefile
+++ b/Makefile
@@ -39,6 +39,12 @@ bmh_clean:
 bmh_clean_host:
 	pushd $(BMDIR) && ./06_host_cleanup.sh && popd
 
+dhcp_start:
+	pushd $(BMDIR) && ./03_launch_prereq.sh --dhcp-start && popd
+
+dhcp_reset:
+	pushd $(BMDIR) && ./03_launch_prereq.sh --dhcp-reset && popd
+
 clean_packages:
 	pushd $(BOOTLOADER_ENV) && \
 	./02_clean_bootloader_package_req.sh --only-packages && popd
@@ -60,19 +66,19 @@ clean_all: bmh_clean \
 	clean_packages
 
 kud_bm_deploy_mini:
-	pushd $(KUD_PATH) && ./kud_bm_launch.sh minimal && popd
+	pushd $(KUD_PATH) && ./kud_bm_launch.sh minimal v1 && popd
 
 kud_bm_deploy:
-	pushd $(KUD_PATH) && ./kud_bm_launch.sh all && popd
+	pushd $(KUD_PATH) && ./kud_bm_launch.sh all v2 && popd
 
 kud_bm_deploy_e2e:
-	pushd $(KUD_PATH) && ./kud_bm_launch.sh bm && popd
+	pushd $(KUD_PATH) && ./kud_bm_launch.sh bm v2 && popd
 
 kud_vm_deploy:
-	pushd $(KUD_PATH) && ./kud_bm_launch.sh vm && popd
+	pushd $(KUD_PATH) && ./kud_bm_launch.sh vm v1 && popd
 
 kud_bm_reset:
-	pushd $(KUD_PATH) && ./kud_bm_launch.sh reset && popd
+	pushd $(KUD_PATH) && ./kud_bm_launch.sh reset v1 && popd
 
 metal3_prerequisite:
 	pushd $(METAL3VMDIR) && make bmh_install && popd
@@ -138,8 +144,10 @@ prerequisite:
 bm_verifer: package_prerequisite \
         kud_bm_deploy_mini \
         bmh_all \
+	dhcp_start \
 	bpa_op_bmh_verifier \
 	bpa_rest_api_verifier \
+	dhcp_reset \
 	clean_all
 
 verify_all: prerequisite \
@@ -153,12 +161,12 @@ 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 \
-        sdwan_verifier \
+        kud_bm_deploy \
         kud_bm_reset \
 	clean_bm_packages