X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=Makefile;h=6ed7b152fe19ab8a49539186868417b6591dd135;hb=8d37977a52baafada063ce4bc1170274e8049e11;hp=84ff14b37282d7564ab6e668bb1068426e517a77;hpb=baff02fe219aa2fb8b7e075aef960785b57b7bc5;p=icn.git

diff --git a/Makefile b/Makefile
index 84ff14b..6ed7b15 100644
--- a/Makefile
+++ b/Makefile
@@ -11,29 +11,29 @@ BOOTLOADER_ENV:=$(CURDIR)/env/ubuntu/bootloader-env
 help:
 	@echo "  Targets:"
 	@echo "  test             -- run unit tests"
-	@echo "  installer        -- run icn installer"
+	@echo "  jump_server      -- install jump server into this machine"
+	@echo "  cluster          -- provision cluster(s)"
 	@echo "  verifier         -- run verifier tests for CI & CD logs"
 	@echo "  unit             -- run the unit tests"
 	@echo "  help             -- this help output"
 
-install: package_prerequisite \
+install: jump_server \
+	bmh_provision
+
+jump_server: package_prerequisite \
 	kud_bm_deploy_mini \
-	bmh_all \
+	bmh_install \
+	capi_install \
 	bpa_op_install \
 	bpa_rest_api_install
 
 package_prerequisite:
 	 pushd $(BMDIR) && ./01_install_package.sh && popd
 
-bmh_preinstall:
-	source user_config.sh && env && \
-	pushd $(BMDIR) && ./02_configure.sh && \
-	./03_launch_prereq.sh && popd
-
 bmh_clean:
 	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 && \
+	./deploy/baremetal-operator/baremetal-operator.sh clean
 
 bmh_clean_host:
 	pushd $(BMDIR) && ./06_host_cleanup.sh && popd
@@ -46,18 +46,33 @@ clean_bm_packages:
 	pushd $(BOOTLOADER_ENV) && \
         ./02_clean_bootloader_package_req.sh --bm-cleanall && popd
 
-bmh_install:
+bmh_preinstall:
 	source user_config.sh && env && \
-	pushd $(METAL3DIR) && ./01_metal3.sh launch && \
-	 ./01_metal3.sh provision && ./02_verify.sh && popd
+	pushd $(BMDIR) && ./02_configure.sh && popd && \
+	./deploy/ironic/ironic.sh deploy
 
-bmh_all: bmh_preinstall bmh_install
+bmh_install: bmh_preinstall
+	./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 \
 	clean_packages
 
+cluster_provision:
+	pushd $(BPA_OPERATOR) && make provision && popd
+
+cluster: bmh_provision \
+	cluster_provision
+
 kud_bm_deploy_mini:
 	pushd $(KUD_PATH) && ./kud_bm_launch.sh minimal v1 && popd
 
@@ -67,15 +82,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
 
@@ -88,18 +103,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
 
@@ -132,12 +140,6 @@ bm_verifer: package_prerequisite \
 
 verifier: bm_verifer
 
-verify_nestedk8s: prerequisite \
-	kud_vm_deploy \
-	bpa_op_virtletvm_verifier \
-	kud_bm_reset \
-	clean_bm_packages
-
 bm_verify_nestedk8s: prerequisite \
         kud_bm_deploy_e2e \
         kud_bm_reset \