X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=Makefile;h=a380bc14b74a09b4c0888d488dd86b4d0e2c13cf;hb=71033a920680e2495f14948c347e99ed2558f6d7;hp=3af3ff956dfa0ed50c23a05988c9eff2f11b53c4;hpb=c3b53a32784bfcb07e6d5dbe84b1b365ff691a4a;p=icn.git

diff --git a/Makefile b/Makefile
index 3af3ff9..a380bc1 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,7 @@ BPA_OPERATOR:=$(CURDIR)/cmd/bpa-operator/
 KUD_PATH:=$(CURDIR)/deploy/kud
 SDWAN_VERIFIER_PATH:=$(CURDIR)/sdwan/test
 BPA_REST_API:=$(CURDIR)/cmd/bpa-restapi-agent
+BOOTLOADER_ENV:=$(CURDIR)/env/ubuntu/bootloader-env
 
 help:
 	@echo "  Targets:"
@@ -16,26 +17,42 @@ help:
 	@echo "  unit             -- run the unit tests"
 	@echo "  help             -- this help output"
 
-install: bmh_all
+install: package_prerequisite \
+	kud_bm_deploy_mini \
+	bmh_all \
+	bpa_op_bmh_verifier
+
+package_prerequisite:
+	 pushd $(BMDIR) && ./01_install_package.sh && popd
 
 bmh_preinstall:
-	pushd $(BMDIR) && ./01_install_package.sh && ./02_configure.sh && \
+	source user_config.sh && env && \
+	pushd $(BMDIR) && ./02_configure.sh && \
 	./03_launch_prereq.sh && popd
 
 bmh_clean:
 	pushd $(METAL3DIR) && ./01_metal3.sh deprovision && \
-	./03_verify_deprovisioning.sh && ./01_metal3.sh clean popd
+	./03_verify_deprovisioning.sh && ./01_metal3.sh clean && \
+        ./01_metal3.sh remove && popd
 
 bmh_clean_host:
 	pushd $(BMDIR) && ./06_host_cleanup.sh && popd
 
+clean_packages:
+	pushd $(BOOTLOADER_ENV) && \
+	./02_clean_bootloader_package_req.sh --only-packages && popd
+
 bmh_install:
+	source user_config.sh && env && \
 	pushd $(METAL3DIR) && ./01_metal3.sh launch && \
 	 ./01_metal3.sh provision && ./02_verify.sh && popd
 
 bmh_all: bmh_preinstall bmh_install
 
-bmh_clean_all: bmh_clean bmh_clean_host
+clean_all: bmh_clean \
+	bmh_clean_host \
+	kud_bm_reset \
+	clean_packages
 
 kud_bm_deploy_mini:
 	pushd $(KUD_PATH) && ./kud_bm_launch.sh minimal && popd
@@ -43,6 +60,9 @@ kud_bm_deploy_mini:
 kud_bm_deploy:
 	pushd $(KUD_PATH) && ./kud_bm_launch.sh all && popd
 
+kud_bm_reset:
+	pushd $(KUD_PATH) && ./kud_bm_launch.sh reset && popd
+
 metal3_prerequisite:
 	pushd $(METAL3VMDIR) && make bmh_install && popd
 
@@ -58,13 +78,18 @@ bpa_op_install:
 bpa_op_delete:
 	pushd $(BPA_OPERATOR) && make delete && popd
 
-bpa_op_e2e:
-	pushd $(BPA_OPERATOR) && make e2etest && popd
+bpa_op_e2e_vm:
+	pushd $(BPA_OPERATOR) && make e2etest_vm && popd
+
+bpa_op_e2e_bmh:
+	pushd $(BPA_OPERATOR) && make e2etest_bmh && popd
 
 bpa_op_unit:
 	pushd $(BPA_OPERATOR) && make unit_test && popd
 
-bpa_op_verifier: bpa_op_install bpa_op_e2e
+bpa_op_vm_verifier: bpa_op_install bpa_op_e2e_vm
+
+bpa_op_bmh_verifier: bpa_op_install bpa_op_e2e_bmh
 
 bpa_op_all: bm_all bpa_op_install
 
@@ -92,7 +117,7 @@ verify_all: prerequisite \
 	metal3_prerequisite \
 	kud_bm_deploy_mini \
 	metal3_vm \
-	bpa_op_verifier \
+	bpa_op_vm_verifier \
 	bpa_rest_api_verifier
 
 verifier: verify_all
@@ -102,3 +127,4 @@ verify_nestedk8s: prerequisite \
 	sdwan_verifier
 
 .PHONY: all bm_preinstall bm_install bashate
+