X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=Makefile;h=a1bcb25b46fb859d9538eda1a97eaf9626024922;hb=a9e5b6c6e3cefdd335dcecb6031e557db7cb2e30;hp=cb5b6f1aa9b731dfa9a651e46bc96c34f7369b28;hpb=f657d9c4670e3eff0bec0fdd6e2a4236f81d507b;p=icn.git

diff --git a/Makefile b/Makefile
index cb5b6f1..a1bcb25 100644
--- a/Makefile
+++ b/Makefile
@@ -39,10 +39,20 @@ 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
 
+clean_bm_packages:
+	pushd $(BOOTLOADER_ENV) && \
+        ./02_clean_bootloader_package_req.sh --bm-cleanall && popd
+
 bmh_install:
 	source user_config.sh && env && \
 	pushd $(METAL3DIR) && ./01_metal3.sh launch && \
@@ -61,6 +71,12 @@ kud_bm_deploy_mini:
 kud_bm_deploy:
 	pushd $(KUD_PATH) && ./kud_bm_launch.sh all && popd
 
+kud_bm_deploy_e2e:
+	pushd $(KUD_PATH) && ./kud_bm_launch.sh bm && popd
+
+kud_vm_deploy:
+	pushd $(KUD_PATH) && ./kud_bm_launch.sh vm && popd
+
 kud_bm_reset:
 	pushd $(KUD_PATH) && ./kud_bm_launch.sh reset && popd
 
@@ -88,6 +104,9 @@ 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
 
@@ -95,6 +114,8 @@ bpa_op_vm_verifier: bpa_op_install bpa_op_e2e_vm
 
 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
 
 bpa_rest_api_install:
@@ -123,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 \
@@ -137,12 +160,17 @@ verify_all: prerequisite \
 verifier: verify_all
 
 verify_nestedk8s: prerequisite \
-	kud_bm_deploy \
-	sdwan_verifier
+	kud_vm_deploy \
+	sdwan_verifier \
+	bpa_op_virtletvm_verifier \
+	kud_bm_reset \
+	clean_bm_packages
 
 bm_verify_nestedk8s: prerequisite \
-       kud_bm_deploy \
-       sdwan_verifier
+        kud_bm_deploy_e2e \
+        sdwan_verifier \
+        kud_bm_reset \
+	clean_bm_packages
 
 .PHONY: all bm_preinstall bm_install bashate