Merge "Delay SriovNetwork deployment after other charts"

[icn.git] / Makefile

diff --git a/Makefile b/Makefile
index 9ed53da..3c61317 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -79,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:
@@ -139,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
+
+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
+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
@@ -162,10 +170,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 \