X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=Makefile;h=3c61317aec0dec814aa7ae11488b2a31a6d42c26;hb=dd7088efd6a1cbdc3071dfd48944d15ccd4a3dac;hp=bf7cfdb927dbf93bf5c00e046901f09f4ffd012e;hpb=3132fc5e4d956ad3181a9ec0c5f234581f8947b1;p=icn.git

diff --git a/Makefile b/Makefile
index bf7cfdb..3c61317 100644
--- a/Makefile
+++ b/Makefile
@@ -23,15 +23,25 @@ install: jump_server \
 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:
@@ -59,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
@@ -73,6 +79,7 @@ cluster: bmh_provision \
 	cluster_provision
 
 kud_bm_deploy_mini:
+	source user_config.sh && \
 	pushd $(KUD_PATH) && ./kud_bm_launch.sh minimal v1 && popd
 
 kud_bm_deploy:
@@ -87,6 +94,12 @@ kud_bm_reset:
 sdwan_verifier:
 	pushd $(SDWAN_VERIFIER_PATH) && bash sdwan_verifier.sh && popd
 
+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
 
@@ -127,14 +140,35 @@ 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: vm_verifier
+
+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
 
-verifier: bm_verifer
+vm_clean_cluster:
+	./deploy/site/vm/vm.sh clean
 
 bm_verify_nestedk8s: prerequisite \
         kud_bm_deploy_e2e \