X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=Makefile;h=d435c3aabec4d80b0777808759f7c4b17003cda9;hb=refs%2Fchanges%2F00%2F3500%2F10;hp=9260307c5b326cd1f1b741ea39d09ff38b74f433;hpb=2c1416234944fe2f4437e27d1b6be6a66850a604;p=icn.git

diff --git a/Makefile b/Makefile
index 9260307..d435c3a 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,8 @@ 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
+BOOTLOADER_ENV:=$(CURDIR)/env/ubuntu/bootloader-env
 
 help:
 	@echo "  Targets:"
@@ -16,21 +17,68 @@ help:
 	@echo "  unit             -- run the unit tests"
 	@echo "  help             -- this help output"
 
-all: bm_install
+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) && ./02_configure.sh && \
+	./03_launch_prereq.sh && popd
+
+bmh_clean:
+	pushd $(METAL3DIR) && ./01_metal3.sh deprovision && \
+	./03_verify_deprovisioning.sh && ./01_metal3.sh clean && \
+        ./01_metal3.sh remove && popd
+
+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
 
-bm_preinstall:
-	pushd $(BMDIR) && ./01_install_package.sh && ./02_configure.sh && ./03_launch_prereq.sh && popd
+clean_packages:
+	pushd $(BOOTLOADER_ENV) && \
+	./02_clean_bootloader_package_req.sh --only-packages && popd
 
-bm_install:
-	pushd $(METAL3DIR) && ./metal3.sh && popd
+clean_bm_packages:
+	pushd $(BOOTLOADER_ENV) && \
+        ./02_clean_bootloader_package_req.sh --bm-cleanall && popd
 
-bm_all: bm_preinstall bm_install
+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
+
+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
+	pushd $(KUD_PATH) && ./kud_bm_launch.sh minimal v1 && popd
 
 kud_bm_deploy:
-	pushd $(KUD_PATH) && ./kud_bm_launch.sh all && popd
+	pushd $(KUD_PATH) && ./kud_bm_launch.sh all v2 && popd
+
+kud_bm_deploy_e2e:
+	pushd $(KUD_PATH) && ./kud_bm_launch.sh bm v2 && popd
+
+kud_vm_deploy:
+	pushd $(KUD_PATH) && ./kud_bm_launch.sh vm v1 && popd
+
+kud_bm_reset:
+	pushd $(KUD_PATH) && ./kud_bm_launch.sh reset v1 && popd
 
 metal3_prerequisite:
 	pushd $(METAL3VMDIR) && make bmh_install && popd
@@ -44,34 +92,83 @@ sdwan_verifier:
 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_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_e2e_virtletvm:
+	pushd $(BPA_OPERATOR) && make e2etest_virtletvm && popd
+
+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_virtletvm_verifier: bpa_op_install bpa_op_e2e_virtletvm
 
 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
+
+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/*' -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: 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
+	metal3_vm \
+	bpa_op_vm_verifier \
+	bpa_rest_api_verifier
 
 verifier: verify_all
 
 verify_nestedk8s: prerequisite \
-	kud_bm_deploy \
-	sdwan_verifier
+	kud_vm_deploy \
+	bpa_op_virtletvm_verifier \
+	kud_bm_reset \
+	clean_bm_packages
+
+bm_verify_nestedk8s: prerequisite \
+        kud_bm_deploy_e2e \
+        kud_bm_reset \
+	clean_bm_packages
 
 .PHONY: all bm_preinstall bm_install bashate
+