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

diff --git a/Makefile b/Makefile
index e32a5ac..096fd4f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,7 @@
 SHELL:=/bin/bash
-ENV:=$(CURDIR)/env
 BMDIR:=$(CURDIR)/env/metal3
-METAL3DIR:=$(CURDIR)/deploy/metal3/scripts
-BPA_OPERATOR:=$(CURDIR)/cmd/bpa-operator/
 KUD_PATH:=$(CURDIR)/deploy/kud
 SDWAN_VERIFIER_PATH:=$(CURDIR)/sdwan/test
-BPA_REST_API:=$(CURDIR)/cmd/bpa-restapi-agent
 BOOTLOADER_ENV:=$(CURDIR)/env/ubuntu/bootloader-env
 
 help:
@@ -17,149 +13,87 @@ help:
 	@echo "  unit             -- run the unit tests"
 	@echo "  help             -- this help output"
 
-install: jump_server \
-	bmh_provision
+install: jump_server
 
 jump_server: package_prerequisite \
 	kud_bm_deploy_mini \
-	bmh_install \
-	bpa_op_install \
-	bpa_rest_api_install
+	bmo_install \
+	capi_install \
+	flux_install
+
+clean_jump_server: bmo_clean_host \
+	kud_bm_reset \
+	clean_packages
 
 package_prerequisite:
 	 pushd $(BMDIR) && ./01_install_package.sh && popd
 
-bmh_clean:
-	pushd $(METAL3DIR) && ./01_metal3.sh deprovision && \
-	./03_verify_deprovisioning.sh && ./01_metal3.sh clean && \
-        ./01_metal3.sh remove && popd
+bmo_clean:
+	./deploy/baremetal-operator/baremetal-operator.sh clean
 
-bmh_clean_host:
+bmo_clean_host:
 	pushd $(BMDIR) && ./06_host_cleanup.sh && popd
 
 clean_packages:
 	pushd $(BOOTLOADER_ENV) && \
 	./02_clean_bootloader_package_req.sh --only-packages && popd
 
-clean_bm_packages:
-	pushd $(BOOTLOADER_ENV) && \
-        ./02_clean_bootloader_package_req.sh --bm-cleanall && popd
-
-bmh_preinstall:
-	source user_config.sh && env && \
-	pushd $(BMDIR) && ./02_configure.sh && \
-	./03_launch_prereq.sh && popd
-
-bmh_install: bmh_preinstall
-	source user_config.sh && env && \
-	pushd $(METAL3DIR) && ./01_metal3.sh launch && popd
-
-bmh_provision:
+bmo_install:
 	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
+	pushd $(BMDIR) && ./02_configure.sh && popd && \
+	./deploy/ironic/ironic.sh deploy && \
+	./deploy/cert-manager/cert-manager.sh deploy && \
+	./deploy/baremetal-operator/baremetal-operator.sh deploy
 
 kud_bm_deploy_mini:
-	pushd $(KUD_PATH) && ./kud_bm_launch.sh minimal v1 && popd
-
-kud_bm_deploy:
-	pushd $(KUD_PATH) && ./kud_bm_launch.sh all v2 && popd
-
-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
+	source user_config.sh && \
+	pushd $(KUD_PATH) && ./kud_bm_launch.sh minimal && popd
 
 kud_bm_reset:
-	pushd $(KUD_PATH) && ./kud_bm_launch.sh reset v1 && popd
+	pushd $(KUD_PATH) && ./kud_bm_launch.sh reset && popd
 
 sdwan_verifier:
 	pushd $(SDWAN_VERIFIER_PATH) && bash sdwan_verifier.sh && popd
 
-bpa_op_install:
-	pushd $(BPA_OPERATOR) && make docker && make deploy && popd
-
-bpa_op_install_e2e:
-	pushd $(BPA_OPERATOR) && make docker_e2e && make deploy && popd
-
-bpa_op_delete:
-	pushd $(BPA_OPERATOR) && make delete && popd
-
-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
+capi_install:
+	./deploy/cluster-api/cluster-api.sh deploy
 
-bpa_op_virtletvm_verifier: bpa_op_install bpa_op_e2e_virtletvm
+flux_install:
+	./deploy/flux/flux.sh deploy
 
-bpa_op_all: bm_all bpa_op_install
-
-bpa_rest_api_install:
-	pushd $(BPA_REST_API) && make deploy && popd
-
-bpa_rest_api_uninstall:
-	pushd $(BPA_REST_API) && make clean && popd
-
-bpa_rest_api_verifier:
-	pushd $(BPA_REST_API) && make e2e_test && popd
-
-bpa_rest_api_unit:
-	pushd $(BPA_REST_API) && make unit_test && popd
-
-unit: prerequisite \
-	bashate \
-	bpa_op_unit \
-	bpa_rest_api_unit
+unit: bashate
 
 bashate:
 	bashate -i E006,E003,E002,E010,E011,E042,E043 `find . -type f -not -path './cmd/bpa-operator/vendor/*' -not -path './ci/jjb/shell/*' -name "*.sh"`
 
-prerequisite:
-	pushd $(ENV) && ./cd_package_installer.sh && popd
+bm_verifer: jump_server \
+	pod11_cluster \
+	pod11_clean_cluster \
+	clean_jump_server
 
-bm_verifer: package_prerequisite \
-        kud_bm_deploy_mini \
-        bmh_all \
-	bpa_op_bmh_verifier \
-	bpa_rest_api_verifier \
-	clean_all
+pod11_cluster:
+	./deploy/site/pod11/pod11.sh deploy
+	./deploy/site/pod11/pod11.sh wait
+	./deploy/kata/kata.sh test
+	./deploy/addons/addons.sh test
 
-verifier: bm_verifer
+pod11_clean_cluster:
+	./deploy/site/pod11/pod11.sh clean
 
-verify_nestedk8s: prerequisite \
-	kud_vm_deploy \
-	bpa_op_virtletvm_verifier \
-	kud_bm_reset \
-	clean_bm_packages
+verifier: vm_verifier
 
-bm_verify_nestedk8s: prerequisite \
-        kud_bm_deploy_e2e \
-        kud_bm_reset \
-	clean_bm_packages
+vm_verifier: jump_server \
+	vm_cluster \
+	vm_clean_cluster \
+	clean_jump_server
 
-kud_bm_verifier: prerequisite \
-	kud_bm_deploy_e2e \
-	kud_bm_reset \
-	clean_bm_packages
+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
 
-.PHONY: all bm_preinstall bm_install bashate
+.PHONY: all bashate