X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=Makefile;h=6c24bdfabab7f840e6976811847f5e93355c5f5f;hb=03e4bff1949371cf04ca653bf47a633ada6a3f6e;hp=c0f38247635bf1b3b782bb79c253def1e6819a40;hpb=7bce432e28247710991b633c43a1c9da7eb7cc57;p=icn.git

diff --git a/Makefile b/Makefile
index c0f3824..6c24bdf 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ METAL3VMDIR:=$(CURDIR)/deploy/metal3-vm
 BPA_OPERATOR:=$(CURDIR)/cmd/bpa-operator/
 KUD_PATH:=$(CURDIR)/deploy/kud
 SDWAN_VERIFIER_PATH:=$(CURDIR)/sdwan/test
-BPA_E2E_SETUP:=https://raw.githubusercontent.com/onap/multicloud-k8s/master/kud/hosting_providers/vagrant/setup.sh
+BPA_REST_API:=$(CURDIR)/cmd/bpa-restapi-agent
 
 help:
 	@echo "  Targets:"
@@ -16,15 +16,26 @@ help:
 	@echo "  unit             -- run the unit tests"
 	@echo "  help             -- this help output"
 
-all: bm_install
+install: bmh_all
 
-bm_preinstall:
-	pushd $(BMDIR) && ./01_install_package.sh && ./02_configure.sh && ./03_launch_prereq.sh && popd
+bmh_preinstall:
+	pushd $(BMDIR) && ./01_install_package.sh && ./02_configure.sh && \
+	./03_launch_prereq.sh && popd
 
-bm_install:
-	pushd $(METAL3DIR) && ./metal3.sh && popd
+bmh_clean:
+	pushd $(METAL3DIR) && ./01_metal3.sh deprovision && \
+	./03_verify_deprovisioning.sh && ./01_metal3.sh clean popd
 
-bm_all: bm_preinstall bm_install
+bmh_clean_host:
+	pushd $(BMDIR) && ./06_host_cleanup.sh && popd
+
+bmh_install:
+	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
 
 kud_bm_deploy_mini:
 	pushd $(KUD_PATH) && ./kud_bm_launch.sh minimal && popd
@@ -47,26 +58,47 @@ bpa_op_install:
 bpa_op_delete:
 	pushd $(BPA_OPERATOR) && make delete && popd
 
-bpa_op_e2e_preinstall:
-	wget $(BPA_E2E_SETUP) && bash setup.sh -p libvirt
+bpa_op_e2e_vm:
+	pushd $(BPA_OPERATOR) && make e2etest_vm && popd
 
-bpa_op_e2e:
-	pushd $(BPA_OPERATOR) && make e2etest && popd
+bpa_op_e2e_bmh:
+	pushd $(BPA_OPERATOR) && make e2etest_bmh && popd
 
-bpa_op_verifier: bpa_op_install bpa_op_e2e	
+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 bpa_op_e2e_bmh
 
 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 `find . -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 \
-	metal3_vm
+	metal3_vm \
+	bpa_op_vm_verifier \
+	bpa_rest_api_verifier
 
 verifier: verify_all
 
@@ -75,3 +107,4 @@ verify_nestedk8s: prerequisite \
 	sdwan_verifier
 
 .PHONY: all bm_preinstall bm_install bashate
+