X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=Makefile;h=3c61317aec0dec814aa7ae11488b2a31a6d42c26;hb=dd7088efd6a1cbdc3071dfd48944d15ccd4a3dac;hp=d520c16833c8119132ebe18aafe69e5a40c345ea;hpb=dc92fbfcbc593060cbe0719bf9f79dc2b57c6934;p=icn.git

diff --git a/Makefile b/Makefile
index d520c16..3c61317 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
@@ -77,6 +79,7 @@ cluster: bmh_provision \
 	cluster_provision
 
 kud_bm_deploy_mini:
+	source user_config.sh && \
 	pushd $(KUD_PATH) && ./kud_bm_launch.sh minimal v1 && popd
 
 kud_bm_deploy:
@@ -137,19 +140,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_verifier
 
 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 +170,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 \