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

diff --git a/Makefile b/Makefile
index ffc6e97..096fd4f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,72 +1,99 @@
 SHELL:=/bin/bash
-ENV:=$(CURDIR)/env
 BMDIR:=$(CURDIR)/env/metal3
-METAL3DIR:=$(CURDIR)/deploy/metal3/scripts
-METAL3VMDIR:=$(CURDIR)/deploy/metal3-vm
-BPA_OPERATOR:=$(CURDIR)/cmd/bpa-operator/
 KUD_PATH:=$(CURDIR)/deploy/kud
-BPA_E2E_SETUP:=https://raw.githubusercontent.com/onap/multicloud-k8s/master/kud/hosting_providers/vagrant/setup.sh
+SDWAN_VERIFIER_PATH:=$(CURDIR)/sdwan/test
+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"
 
-all: bm_install
+install: jump_server
 
-bm_preinstall:
-	pushd $(BMDIR) && ./01_install_package.sh && ./02_configure.sh && ./03_launch_prereq.sh && popd
+jump_server: package_prerequisite \
+	kud_bm_deploy_mini \
+	bmo_install \
+	capi_install \
+	flux_install
 
-bm_install:
-	pushd $(METAL3DIR) && ./metal3.sh && popd
+clean_jump_server: bmo_clean_host \
+	kud_bm_reset \
+	clean_packages
 
-bm_all: bm_preinstall bm_install
+package_prerequisite:
+	 pushd $(BMDIR) && ./01_install_package.sh && popd
 
-kud_bm_deploy_mini:
-	pushd $(KUD_PATH) && ./kud_bm_launch.sh minimal && popd
+bmo_clean:
+	./deploy/baremetal-operator/baremetal-operator.sh clean
 
-kud_bm_deploy:
-	pushd $(KUD_PATH) && ./kud_bm_launch.sh all && popd
+bmo_clean_host:
+	pushd $(BMDIR) && ./06_host_cleanup.sh && popd
 
-metal3_prerequisite:
-	pushd $(METAL3VMDIR) && make bmh_install && popd
+clean_packages:
+	pushd $(BOOTLOADER_ENV) && \
+	./02_clean_bootloader_package_req.sh --only-packages && popd
 
-metal3_vm:
-	pushd $(METAL3VMDIR) && make bmh && popd
+bmo_install:
+	source user_config.sh && env && \
+	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
 
-bpa_op_install:
-	pushd $(BPA_OPERATOR) && make docker && make deploy && popd
+kud_bm_deploy_mini:
+	source user_config.sh && \
+	pushd $(KUD_PATH) && ./kud_bm_launch.sh minimal && popd
 
-bpa_op_delete:
-	pushd $(BPA_OPERATOR) && make delete && popd
+kud_bm_reset:
+	pushd $(KUD_PATH) && ./kud_bm_launch.sh reset && popd
 
-bpa_op_e2e_preinstall:
-	wget $(BPA_E2E_SETUP) && bash setup.sh -p libvirt
+sdwan_verifier:
+	pushd $(SDWAN_VERIFIER_PATH) && bash sdwan_verifier.sh && popd
 
-bpa_op_e2e:
-	pushd $(BPA_OPERATOR) && make e2etest && popd
+capi_install:
+	./deploy/cluster-api/cluster-api.sh deploy
 
-bpa_op_verifier: bpa_op_install bpa_op_e2e	
+flux_install:
+	./deploy/flux/flux.sh deploy
 
-bpa_op_all: bm_all bpa_op_install
+unit: bashate
 
 bashate:
-	bashate -i E006,E003,E002,E010,E011,E042,E043 `find . -type f -not -path './cmd/bpa-operator/vendor/*' -name *.sh`
+	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
 
-verify_all: prerequisite \
-	metal3_prerequisite \
-	kud_bm_deploy_mini \
-	metal3_vm
+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
 
-verifier: verify_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
 
-verify_nestedk8s: prerequisite \
-	kud_bm_deploy
+vm_clean_cluster:
+	./deploy/site/vm/vm.sh clean
 
-.PHONY: all bm_preinstall bm_install bashate
+.PHONY: all bashate