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

diff --git a/Makefile b/Makefile
index a380bc1..84ff14b 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,6 @@ SHELL:=/bin/bash
 ENV:=$(CURDIR)/env
 BMDIR:=$(CURDIR)/env/metal3
 METAL3DIR:=$(CURDIR)/deploy/metal3/scripts
-METAL3VMDIR:=$(CURDIR)/deploy/metal3-vm
 BPA_OPERATOR:=$(CURDIR)/cmd/bpa-operator/
 KUD_PATH:=$(CURDIR)/deploy/kud
 SDWAN_VERIFIER_PATH:=$(CURDIR)/sdwan/test
@@ -20,7 +19,8 @@ help:
 install: package_prerequisite \
 	kud_bm_deploy_mini \
 	bmh_all \
-	bpa_op_bmh_verifier
+	bpa_op_install \
+	bpa_rest_api_install
 
 package_prerequisite:
 	 pushd $(BMDIR) && ./01_install_package.sh && popd
@@ -42,6 +42,10 @@ clean_packages:
 	pushd $(BOOTLOADER_ENV) && \
 	./02_clean_bootloader_package_req.sh --only-packages && popd
 
+clean_bm_packages:
+	pushd $(BOOTLOADER_ENV) && \
+        ./02_clean_bootloader_package_req.sh --bm-cleanall && popd
+
 bmh_install:
 	source user_config.sh && env && \
 	pushd $(METAL3DIR) && ./01_metal3.sh launch && \
@@ -55,19 +59,19 @@ clean_all: bmh_clean \
 	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_reset:
-	pushd $(KUD_PATH) && ./kud_bm_launch.sh reset && popd
+kud_bm_deploy_e2e:
+	pushd $(KUD_PATH) && ./kud_bm_launch.sh bm v2 && popd
 
-metal3_prerequisite:
-	pushd $(METAL3VMDIR) && make bmh_install && popd
+kud_vm_deploy:
+	pushd $(KUD_PATH) && ./kud_bm_launch.sh vm v1 && popd
 
-metal3_vm:
-	pushd $(METAL3VMDIR) && make bmh && popd
+kud_bm_reset:
+	pushd $(KUD_PATH) && ./kud_bm_launch.sh reset v1 && popd
 
 sdwan_verifier:
 	pushd $(SDWAN_VERIFIER_PATH) && bash sdwan_verifier.sh && popd
@@ -75,21 +79,24 @@ sdwan_verifier:
 bpa_op_install:
 	pushd $(BPA_OPERATOR) && make docker && make deploy && popd
 
+bpa_op_install_e2e:
+	pushd $(BPA_OPERATOR) && make docker_e2e && make deploy && popd
+
 bpa_op_delete:
 	pushd $(BPA_OPERATOR) && make delete && 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_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_e2e bpa_op_e2e_bmh
 
-bpa_op_bmh_verifier: bpa_op_install bpa_op_e2e_bmh
+bpa_op_virtletvm_verifier: bpa_op_install bpa_op_e2e_virtletvm
 
 bpa_op_all: bm_all bpa_op_install
 
@@ -105,26 +112,40 @@ 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 \
+	bpa_rest_api_verifier \
+	clean_all
 
-verify_all: prerequisite \
-	metal3_prerequisite \
-	kud_bm_deploy_mini \
-	metal3_vm \
-	bpa_op_vm_verifier \
-	bpa_rest_api_verifier
-
-verifier: verify_all
+verifier: bm_verifer
 
 verify_nestedk8s: prerequisite \
-	kud_bm_deploy \
-	sdwan_verifier
+	kud_vm_deploy \
+	bpa_op_virtletvm_verifier \
+	kud_bm_reset \
+	clean_bm_packages
 
-.PHONY: all bm_preinstall bm_install bashate
+bm_verify_nestedk8s: prerequisite \
+        kud_bm_deploy_e2e \
+        kud_bm_reset \
+	clean_bm_packages
 
+kud_bm_verifier: prerequisite \
+	kud_bm_deploy_e2e \
+	kud_bm_reset \
+	clean_bm_packages
+
+.PHONY: all bm_preinstall bm_install bashate