X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=Makefile;h=d435c3aabec4d80b0777808759f7c4b17003cda9;hb=refs%2Fchanges%2F00%2F3500%2F10;hp=ac3d0d77467a0a93aef742241f385182a1c99065;hpb=305507c76e667e33401a5fcd50c238d1dcaec3fd;p=icn.git

diff --git a/Makefile b/Makefile
index ac3d0d7..d435c3a 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 && \
@@ -56,13 +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 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
@@ -76,6 +92,9 @@ 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_delete:
 	pushd $(BPA_OPERATOR) && make delete && popd
 
@@ -85,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_bmh_verifier: bpa_op_install 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
 
@@ -112,7 +136,7 @@ unit: prerequisite \
 	bpa_rest_api_unit
 
 bashate:
-	bashate -i E006,E003,E002,E010,E011,E042,E043 `find . -type f -not -path './cmd/bpa-operator/vendor/*' -not -path './ci/jjb/shell/*' -name *.sh`
+	bashate -i E006,E003,E002,E010,E011,E042,E043 `find . -type f -not -path './cmd/bpa-operator/vendor/*' -not -path './ci/jjb/shell/*' -name "*.sh"`
 
 prerequisite:
 	pushd $(ENV) && ./cd_package_installer.sh && popd
@@ -120,7 +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 \
@@ -133,8 +160,15 @@ 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 \
+        kud_bm_reset \
+	clean_bm_packages
 
 .PHONY: all bm_preinstall bm_install bashate