X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=Makefile;h=a259336bd6110edb0e0e3d0c060fc3eeae7de646;hb=43dbb5a2353606d1801f08dcf3e2fd06399843fb;hp=d435c3aabec4d80b0777808759f7c4b17003cda9;hpb=ab49400d4b8fa2466758462f33a723941fcdc79e;p=icn.git diff --git a/Makefile b/Makefile index d435c3a..a259336 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,6 @@ 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 SDWAN_VERIFIER_PATH:=$(CURDIR)/sdwan/test @@ -12,39 +11,37 @@ 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: bmh_deprovision bmo_clean -bmh_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 -dhcp_start: - pushd $(BMDIR) && ./03_launch_prereq.sh --dhcp-start && popd - -dhcp_reset: - pushd $(BMDIR) && ./03_launch_prereq.sh --dhcp-reset && popd - clean_packages: pushd $(BOOTLOADER_ENV) && \ ./02_clean_bootloader_package_req.sh --only-packages && popd @@ -53,18 +50,31 @@ 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_install: bmh_preinstall + ./deploy/cert-manager/cert-manager.sh deploy && \ + ./deploy/baremetal-operator/baremetal-operator.sh deploy -bmh_all: bmh_preinstall bmh_install +bmh_provision: + source user_config.sh && env && \ + pushd $(METAL3DIR) && ./01_metal3.sh provision && \ + ./02_verify.sh && popd 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 @@ -74,49 +84,31 @@ 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 -metal3_prerequisite: - pushd $(METAL3VMDIR) && make bmh_install && popd - -metal3_vm: - pushd $(METAL3VMDIR) && make bmh && 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 -bpa_op_install_bmh_e2e: - pushd $(BPA_OPERATOR) && make docker_bmh_e2e && 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_vm: - pushd $(BPA_OPERATOR) && make e2etest_vm && 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_vm_verifier: bpa_op_install bpa_op_e2e_vm - -bpa_op_bmh_verifier: bpa_op_install_bmh_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_op_bmh_verifier: bpa_op_install_e2e bpa_op_e2e_bmh bpa_rest_api_install: pushd $(BPA_REST_API) && make deploy && popd @@ -142,33 +134,42 @@ prerequisite: pushd $(ENV) && ./cd_package_installer.sh && popd bm_verifer: package_prerequisite \ - kud_bm_deploy_mini \ - bmh_all \ - dhcp_start \ + kud_bm_deploy_mini \ + bmh_install \ + bmh_provision \ bpa_op_bmh_verifier \ bpa_rest_api_verifier \ - dhcp_reset \ clean_all -verify_all: prerequisite \ - metal3_prerequisite \ - kud_bm_deploy_mini \ - metal3_vm \ - bpa_op_vm_verifier \ - bpa_rest_api_verifier +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 -verifier: verify_all +vm_clean_cluster: + ./deploy/site/vm/vm.sh clean -verify_nestedk8s: prerequisite \ - kud_vm_deploy \ - bpa_op_virtletvm_verifier \ +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 \ kud_bm_reset \ clean_bm_packages -.PHONY: all bm_preinstall bm_install bashate +kud_bm_verifier: prerequisite \ + kud_bm_deploy_e2e \ + kud_bm_reset \ + clean_bm_packages +.PHONY: all bm_preinstall bm_install bashate