X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=Makefile;h=8db3f94882eb520bdd289750e16c5e8dd215d47c;hb=e8e841bbb47563c12591580b743a9738b740fc81;hp=d520c16833c8119132ebe18aafe69e5a40c345ea;hpb=245b963a4b4e0d179ab46eb52917bc569b83e607;p=icn.git diff --git a/Makefile b/Makefile index d520c16..8db3f94 100644 --- a/Makefile +++ b/Makefile @@ -28,6 +28,10 @@ jump_server: package_prerequisite \ bpa_op_install \ bpa_rest_api_install +clean_jump_server: bmh_clean_host \ + kud_bm_reset \ + clean_packages + package_prerequisite: pushd $(BMDIR) && ./01_install_package.sh && popd @@ -66,9 +70,7 @@ bmh_provision: ./02_verify.sh && popd clean_all: bmh_clean \ - bmh_clean_host \ - kud_bm_reset \ - clean_packages + clean_jump_server cluster_provision: pushd $(BPA_OPERATOR) && make provision && popd @@ -137,19 +139,26 @@ bashate: prerequisite: pushd $(ENV) && ./cd_package_installer.sh && popd -bm_verifer: package_prerequisite \ - kud_bm_deploy_mini \ - bmh_install \ - bmh_provision \ - bpa_op_bmh_verifier \ - bpa_rest_api_verifier \ - clean_all +bm_verifer: jump_server \ + pod11_cluster \ + pod11_clean_cluster \ + clean_jump_server -verifier: bm_verifer +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_verifer vm_verifier: jump_server \ vm_cluster \ - vm_clean_all + vm_clean_cluster \ + clean_jump_server vm_cluster: ./deploy/site/vm/vm.sh deploy @@ -160,12 +169,6 @@ vm_cluster: vm_clean_cluster: ./deploy/site/vm/vm.sh clean -vm_clean_all: vm_clean_cluster \ - bmo_clean \ - bmh_clean_host \ - kud_bm_reset \ - clean_packages - bm_verify_nestedk8s: prerequisite \ kud_bm_deploy_e2e \ kud_bm_reset \