From a945ab57f8a390395623f1d4c6168987f97cd61c Mon Sep 17 00:00:00 2001 From: Todd Malsbary Date: Wed, 5 Jan 2022 11:45:57 -0800 Subject: [PATCH] Replace bm_verifer target with CAPI Signed-off-by: Todd Malsbary Change-Id: If23b1f764eac6b08bf853e4972f4e1f8066c08fd --- Makefile | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 9ed53da..1078b56 100644 --- a/Makefile +++ b/Makefile @@ -139,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 + +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: bm_verifer vm_verifier: jump_server \ vm_cluster \ - vm_clean_all + vm_clean_cluster \ + clean_jump_server vm_cluster: ./deploy/site/vm/vm.sh deploy @@ -162,10 +169,6 @@ vm_cluster: vm_clean_cluster: ./deploy/site/vm/vm.sh clean -vm_clean_all: vm_clean_cluster \ - bmo_clean \ - clean_jump_server - bm_verify_nestedk8s: prerequisite \ kud_bm_deploy_e2e \ kud_bm_reset \ -- 2.16.6