X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=Makefile;h=22e13fddf243889e28acb4fb23fdb8cf78563082;hb=509525bd5e8f8fa325dee7a2c8a8da831cc70fc9;hp=59c3a36ceca77728cf8ed69510739984b88db92b;hpb=8206d92d9942d980c6280c39f4d4ef7b0b24a898;p=icn.git

diff --git a/Makefile b/Makefile
index 59c3a36..22e13fd 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,20 +17,32 @@ 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_install \
+	bpa_rest_api_install
+
+package_prerequisite:
+	 pushd $(BMDIR) && ./01_install_package.sh && popd
 
 bmh_preinstall:
 	source user_config.sh && env && \
-	pushd $(BMDIR) && ./01_install_package.sh && ./02_configure.sh && \
+	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 && \
@@ -37,7 +50,10 @@ bmh_install:
 
 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
@@ -45,6 +61,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
 
@@ -60,13 +79,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
 
@@ -82,19 +106,28 @@ bpa_rest_api_verifier:
 bpa_rest_api_unit:
 	pushd $(BPA_REST_API) && make unit_test && popd
 
+unit: prerequisite \
+	bashate \
+	bpa_op_unit \
+	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
 
-bm_verifer: install
+bm_verifer: package_prerequisite \
+        kud_bm_deploy_mini \
+        bmh_all \
+	bpa_op_bmh_verifier \
+	clean_all
 
 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
@@ -104,3 +137,4 @@ verify_nestedk8s: prerequisite \
 	sdwan_verifier
 
 .PHONY: all bm_preinstall bm_install bashate
+