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

diff --git a/Makefile b/Makefile
index 6ed7b15..9ed53da 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
 
@@ -132,14 +140,32 @@ prerequisite:
 	pushd $(ENV) && ./cd_package_installer.sh && popd
 
 bm_verifer: package_prerequisite \
-        kud_bm_deploy_mini \
-        bmh_all \
+	kud_bm_deploy_mini \
+	bmh_install \
+	bmh_provision \
 	bpa_op_bmh_verifier \
 	bpa_rest_api_verifier \
 	clean_all
 
 verifier: bm_verifer
 
+vm_verifier: jump_server \
+	vm_cluster \
+	vm_clean_all
+
+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
+
+vm_clean_all: vm_clean_cluster \
+	bmo_clean \
+	clean_jump_server
+
 bm_verify_nestedk8s: prerequisite \
         kud_bm_deploy_e2e \
         kud_bm_reset \