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

diff --git a/Makefile b/Makefile
index c8695be..3af3ff9 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,6 @@ KUD_PATH:=$(CURDIR)/deploy/kud
 SDWAN_VERIFIER_PATH:=$(CURDIR)/sdwan/test
 BPA_REST_API:=$(CURDIR)/cmd/bpa-restapi-agent
 
-
 help:
 	@echo "  Targets:"
 	@echo "  test             -- run unit tests"
@@ -17,15 +16,26 @@ help:
 	@echo "  unit             -- run the unit tests"
 	@echo "  help             -- this help output"
 
-all: bm_install
+install: bmh_all
+
+bmh_preinstall:
+	pushd $(BMDIR) && ./01_install_package.sh && ./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
+
+bmh_clean_host:
+	pushd $(BMDIR) && ./06_host_cleanup.sh && popd
 
-bm_preinstall:
-	pushd $(BMDIR) && ./01_install_package.sh && ./02_configure.sh && ./03_launch_prereq.sh && popd
+bmh_install:
+	pushd $(METAL3DIR) && ./01_metal3.sh launch && \
+	 ./01_metal3.sh provision && ./02_verify.sh && popd
 
-bm_install:
-	pushd $(METAL3DIR) && ./metal3.sh && popd
+bmh_all: bmh_preinstall bmh_install
 
-bm_all: bm_preinstall bm_install
+bmh_clean_all: bmh_clean bmh_clean_host
 
 kud_bm_deploy_mini:
 	pushd $(KUD_PATH) && ./kud_bm_launch.sh minimal && popd
@@ -51,6 +61,9 @@ bpa_op_delete:
 bpa_op_e2e:
 	pushd $(BPA_OPERATOR) && make e2etest && popd
 
+bpa_op_unit:
+	pushd $(BPA_OPERATOR) && make unit_test && popd
+
 bpa_op_verifier: bpa_op_install bpa_op_e2e
 
 bpa_op_all: bm_all bpa_op_install
@@ -58,15 +71,23 @@ bpa_op_all: bm_all bpa_op_install
 bpa_rest_api_install:
 	pushd $(BPA_REST_API) && make deploy && popd
 
+bpa_rest_api_uninstall:
+	pushd $(BPA_REST_API) && make clean && popd
+
 bpa_rest_api_verifier:
 	pushd $(BPA_REST_API) && make e2e_test && popd
 
+bpa_rest_api_unit:
+	pushd $(BPA_REST_API) && make unit_test && popd
+
 bashate:
-	bashate -i E006,E003,E002,E010,E011,E042,E043 `find . -type f -not -path './cmd/bpa-operator/vendor/*' -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
 
+bm_verifer: install
+
 verify_all: prerequisite \
 	metal3_prerequisite \
 	kud_bm_deploy_mini \