Merge "Delay SriovNetwork deployment after other charts"

[icn.git] / Makefile

diff --git a/Makefile b/Makefile
index 1ccfae2..3c61317 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,9 +24,14 @@ jump_server: package_prerequisite \
        kud_bm_deploy_mini \
        bmh_install \
        capi_install \
+       flux_install \
        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
 
@@ -65,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
@@ -76,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:
@@ -93,6 +97,9 @@ sdwan_verifier:
 capi_install:
        ./deploy/cluster-api/cluster-api.sh deploy
 
+flux_install:
+       ./deploy/flux/flux.sh deploy
+
 bpa_op_install:
        pushd $(BPA_OPERATOR) && make docker && make deploy && popd
 
@@ -133,22 +140,28 @@ 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 build
        ./deploy/site/vm/vm.sh deploy
        ./deploy/site/vm/vm.sh wait
        ./deploy/kata/kata.sh test
@@ -157,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 \