Use Vagrantfile to build virtual site

[icn.git] / Makefile

diff --git a/Makefile b/Makefile
index 00f73ff..2f21037 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -39,12 +39,6 @@ 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
@@ -92,8 +86,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
@@ -110,9 +104,9 @@ bpa_op_e2e_virtletvm:
 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_bmh_e2e bpa_op_e2e_bmh
+bpa_op_bmh_verifier: bpa_op_install_e2e bpa_op_e2e_bmh
 
 bpa_op_virtletvm_verifier: bpa_op_install bpa_op_e2e_virtletvm
 
@@ -144,10 +138,8 @@ 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 \
@@ -166,9 +158,14 @@ verify_nestedk8s: prerequisite \
        clean_bm_packages
 
 bm_verify_nestedk8s: prerequisite \
-        kud_bm_deploy \
+        kud_bm_deploy_e2e \
         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