X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=Makefile;h=a259336bd6110edb0e0e3d0c060fc3eeae7de646;hb=43dbb5a2353606d1801f08dcf3e2fd06399843fb;hp=e32a5acc9a1ce41fb142ba3c502c770122fc819a;hpb=96ecd8d02563a2c72ba0fd9ab4599695821ff888;p=icn.git

diff --git a/Makefile b/Makefile
index e32a5ac..a259336 100644
--- a/Makefile
+++ b/Makefile
@@ -23,16 +23,21 @@ install: jump_server \
 jump_server: package_prerequisite \
 	kud_bm_deploy_mini \
 	bmh_install \
+	capi_install \
 	bpa_op_install \
 	bpa_rest_api_install
 
 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 && \
-        ./01_metal3.sh remove && popd
+	./03_verify_deprovisioning.sh && ./01_metal3.sh clean && popd
+
+bmo_clean:
+	./deploy/baremetal-operator/baremetal-operator.sh clean
 
 bmh_clean_host:
 	pushd $(BMDIR) && ./06_host_cleanup.sh && popd
@@ -47,20 +52,18 @@ clean_bm_packages:
 
 bmh_preinstall:
 	source user_config.sh && env && \
-	pushd $(BMDIR) && ./02_configure.sh && \
-	./03_launch_prereq.sh && popd
+	pushd $(BMDIR) && ./02_configure.sh && popd && \
+	./deploy/ironic/ironic.sh deploy
 
 bmh_install: bmh_preinstall
-	source user_config.sh && env && \
-	pushd $(METAL3DIR) && ./01_metal3.sh launch && popd
+	./deploy/cert-manager/cert-manager.sh deploy && \
+	./deploy/baremetal-operator/baremetal-operator.sh deploy
 
 bmh_provision:
 	source user_config.sh && env && \
 	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 \
@@ -81,15 +84,15 @@ kud_bm_deploy:
 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
 
 sdwan_verifier:
 	pushd $(SDWAN_VERIFIER_PATH) && bash sdwan_verifier.sh && popd
 
+capi_install:
+	./deploy/cluster-api/cluster-api.sh deploy
+
 bpa_op_install:
 	pushd $(BPA_OPERATOR) && make docker && make deploy && popd
 
@@ -102,18 +105,11 @@ bpa_op_delete:
 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_bmh_verifier: bpa_op_install_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
 
@@ -138,19 +134,33 @@ 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
 
-verify_nestedk8s: prerequisite \
-	kud_vm_deploy \
-	bpa_op_virtletvm_verifier \
+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 \
+	bmh_clean_host \
 	kud_bm_reset \
-	clean_bm_packages
+	clean_packages
 
 bm_verify_nestedk8s: prerequisite \
         kud_bm_deploy_e2e \