X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=Makefile;h=84ff14b37282d7564ab6e668bb1068426e517a77;hb=baff02fe219aa2fb8b7e075aef960785b57b7bc5;hp=00f73ff9e9ef442ef01d384d1bc2f45081733007;hpb=5aad0006c102e47de67cd9c01c57abd443cb06d6;p=icn.git

diff --git a/Makefile b/Makefile
index 00f73ff..84ff14b 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,6 @@ SHELL:=/bin/bash
 ENV:=$(CURDIR)/env
 BMDIR:=$(CURDIR)/env/metal3
 METAL3DIR:=$(CURDIR)/deploy/metal3/scripts
-METAL3VMDIR:=$(CURDIR)/deploy/metal3-vm
 BPA_OPERATOR:=$(CURDIR)/cmd/bpa-operator/
 KUD_PATH:=$(CURDIR)/deploy/kud
 SDWAN_VERIFIER_PATH:=$(CURDIR)/sdwan/test
@@ -39,12 +38,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
@@ -80,27 +73,18 @@ kud_vm_deploy:
 kud_bm_reset:
 	pushd $(KUD_PATH) && ./kud_bm_launch.sh reset v1 && popd
 
-metal3_prerequisite:
-	pushd $(METAL3VMDIR) && make bmh_install && popd
-
-metal3_vm:
-	pushd $(METAL3VMDIR) && make bmh && popd
-
 sdwan_verifier:
 	pushd $(SDWAN_VERIFIER_PATH) && bash sdwan_verifier.sh && popd
 
 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
 
-bpa_op_e2e_vm:
-	pushd $(BPA_OPERATOR) && make e2etest_vm && popd
-
 bpa_op_e2e_bmh:
 	pushd $(BPA_OPERATOR) && make e2etest_bmh && popd
 
@@ -110,9 +94,7 @@ 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_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,20 +126,11 @@ 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 \
-	metal3_prerequisite \
-	kud_bm_deploy_mini \
-	metal3_vm \
-	bpa_op_vm_verifier \
-	bpa_rest_api_verifier
-
-verifier: verify_all
+verifier: bm_verifer
 
 verify_nestedk8s: prerequisite \
 	kud_vm_deploy \
@@ -166,9 +139,13 @@ verify_nestedk8s: prerequisite \
 	clean_bm_packages
 
 bm_verify_nestedk8s: prerequisite \
-        kud_bm_deploy \
+        kud_bm_deploy_e2e \
         kud_bm_reset \
 	clean_bm_packages
 
-.PHONY: all bm_preinstall bm_install bashate
+kud_bm_verifier: prerequisite \
+	kud_bm_deploy_e2e \
+	kud_bm_reset \
+	clean_bm_packages
 
+.PHONY: all bm_preinstall bm_install bashate