X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=Makefile;h=1078b56856aef40e2a978dc492ce83e25a595756;hb=d85af5c74b2be9115a7874a1baaae3945a312ccb;hp=6ed7b152fe19ab8a49539186868417b6591dd135;hpb=f1efcecf2761d7c31845bbd2bd995abc518440ad;p=icn.git

diff --git a/Makefile b/Makefile
index 6ed7b15..1078b56 100644
--- a/Makefile
+++ b/Makefile
@@ -24,15 +24,24 @@ jump_server: package_prerequisite \
 	kud_bm_deploy_mini \
 	bmh_install \
 	capi_install \
+	flux_install \
 	bpa_op_install \
 	bpa_rest_api_install
 
+clean_jump_server: bmh_clean_host \
+	kud_bm_reset \
+	clean_packages
+
 package_prerequisite:
 	 pushd $(BMDIR) && ./01_install_package.sh && popd
 
-bmh_clean:
+bmh_clean: bmh_deprovision bmo_clean
+
+bmh_deprovision:
 	pushd $(METAL3DIR) && ./01_metal3.sh deprovision && \
-	./03_verify_deprovisioning.sh && ./01_metal3.sh clean && popd && \
+	./03_verify_deprovisioning.sh && ./01_metal3.sh clean && popd
+
+bmo_clean:
 	./deploy/baremetal-operator/baremetal-operator.sh clean
 
 bmh_clean_host:
@@ -60,12 +69,8 @@ bmh_provision:
 	pushd $(METAL3DIR) && ./01_metal3.sh provision && \
 	./02_verify.sh && popd
 
-bmh_all: bmh_install bmh_provision
-
 clean_all: bmh_clean \
-	bmh_clean_host \
-	kud_bm_reset \
-	clean_packages
+	clean_jump_server
 
 cluster_provision:
 	pushd $(BPA_OPERATOR) && make provision && popd
@@ -91,6 +96,9 @@ sdwan_verifier:
 capi_install:
 	./deploy/cluster-api/cluster-api.sh deploy
 
+flux_install:
+	./deploy/flux/flux.sh deploy
+
 bpa_op_install:
 	pushd $(BPA_OPERATOR) && make docker && make deploy && popd
 
@@ -131,15 +139,36 @@ bashate:
 prerequisite:
 	pushd $(ENV) && ./cd_package_installer.sh && popd
 
-bm_verifer: package_prerequisite \
-        kud_bm_deploy_mini \
-        bmh_all \
-	bpa_op_bmh_verifier \
-	bpa_rest_api_verifier \
-	clean_all
+bm_verifer: jump_server \
+	pod11_cluster \
+	pod11_clean_cluster \
+	clean_jump_server
+
+pod11_cluster:
+	./deploy/site/pod11/pod11.sh deploy
+	./deploy/site/pod11/pod11.sh wait
+	./deploy/kata/kata.sh test
+	./deploy/addons/addons.sh test
+
+pod11_clean_cluster:
+	./deploy/site/pod11/pod11.sh clean
 
 verifier: bm_verifer
 
+vm_verifier: jump_server \
+	vm_cluster \
+	vm_clean_cluster \
+	clean_jump_server
+
+vm_cluster:
+	./deploy/site/vm/vm.sh deploy
+	./deploy/site/vm/vm.sh wait
+	./deploy/kata/kata.sh test
+	./deploy/addons/addons.sh test
+
+vm_clean_cluster:
+	./deploy/site/vm/vm.sh clean
+
 bm_verify_nestedk8s: prerequisite \
         kud_bm_deploy_e2e \
         kud_bm_reset \