X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=Makefile;h=a5016214acf56abecbf405437275a3016d0cc678;hb=57733b901fecd31843977b746b94a321891fa3d3;hp=3fca41bdf7a9fc93910b142a65711c1c0c0d18b6;hpb=ec966951c55b36d3cbe5964303862dc0865d6603;p=icn.git

diff --git a/Makefile b/Makefile
index 3fca41b..a501621 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,16 +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 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
@@ -83,8 +92,8 @@ sdwan_verifier:
 bpa_op_install:
 	pushd $(BPA_OPERATOR) && make docker && make deploy && popd
 
-bpa_op_install_bmh_e2e:
-	pushd $(BPA_OPERATOR) && make docker_bmh_e2e && make deploy && popd
+bpa_op_install_e2e:
+	pushd $(BPA_OPERATOR) && make docker_e2e && make deploy && popd
 
 bpa_op_delete:
 	pushd $(BPA_OPERATOR) && make delete && popd
@@ -95,12 +104,17 @@ bpa_op_e2e_vm:
 bpa_op_e2e_bmh:
 	pushd $(BPA_OPERATOR) && make e2etest_bmh && popd
 
+bpa_op_e2e_virtletvm:
+	pushd $(BPA_OPERATOR) && make e2etest_virtletvm && popd
+
 bpa_op_unit:
 	pushd $(BPA_OPERATOR) && make unit_test && popd
 
-bpa_op_vm_verifier: bpa_op_install bpa_op_e2e_vm
+bpa_op_vm_verifier: bpa_op_install_e2e bpa_op_e2e_vm
+
+bpa_op_bmh_verifier: bpa_op_install_e2e bpa_op_e2e_bmh
 
-bpa_op_bmh_verifier: bpa_op_install_bmh_e2e bpa_op_e2e_bmh
+bpa_op_virtletvm_verifier: bpa_op_install bpa_op_e2e_virtletvm
 
 bpa_op_all: bm_all bpa_op_install
 
@@ -130,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 \
@@ -144,14 +160,20 @@ verify_all: prerequisite \
 verifier: verify_all
 
 verify_nestedk8s: prerequisite \
-	kud_bm_deploy \
-	sdwan_verifier
+	kud_vm_deploy \
+	bpa_op_virtletvm_verifier \
+	kud_bm_reset \
+	clean_bm_packages
 
 bm_verify_nestedk8s: prerequisite \
         kud_bm_deploy_e2e \
-        sdwan_verifier \
         kud_bm_reset \
 	clean_bm_packages
 
+kud_bm_verifier: prerequisite \
+	kud_bm_deploy_e2e \
+	kud_bm_reset \
+	clean_bm_packages
+
 .PHONY: all bm_preinstall bm_install bashate