Use Vagrantfile to build virtual site

[icn.git] / Makefile

diff --git a/Makefile b/Makefile
index cb5b6f1..2f21037 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,10 @@ clean_packages:
        pushd $(BOOTLOADER_ENV) && \
        ./02_clean_bootloader_package_req.sh --only-packages && popd
 
+clean_bm_packages:
+       pushd $(BOOTLOADER_ENV) && \
+        ./02_clean_bootloader_package_req.sh --bm-cleanall && popd
+
 bmh_install:
        source user_config.sh && env && \
        pushd $(METAL3DIR) && ./01_metal3.sh launch && \
@@ -56,13 +60,19 @@ clean_all: bmh_clean \
        clean_packages
 
 kud_bm_deploy_mini:
-       pushd $(KUD_PATH) && ./kud_bm_launch.sh minimal && popd
+       pushd $(KUD_PATH) && ./kud_bm_launch.sh minimal v1 && popd
 
 kud_bm_deploy:
-       pushd $(KUD_PATH) && ./kud_bm_launch.sh all && popd
+       pushd $(KUD_PATH) && ./kud_bm_launch.sh all v2 && popd
+
+kud_bm_deploy_e2e:
+       pushd $(KUD_PATH) && ./kud_bm_launch.sh bm v2 && popd
+
+kud_vm_deploy:
+       pushd $(KUD_PATH) && ./kud_bm_launch.sh vm v1 && popd
 
 kud_bm_reset:
-       pushd $(KUD_PATH) && ./kud_bm_launch.sh reset && popd
+       pushd $(KUD_PATH) && ./kud_bm_launch.sh reset v1 && popd
 
 metal3_prerequisite:
        pushd $(METAL3VMDIR) && make bmh_install && popd
@@ -76,8 +86,8 @@ sdwan_verifier:
 bpa_op_install:
        pushd $(BPA_OPERATOR) && make docker && make deploy && popd
 
-bpa_op_install_bmh_e2e:
-       pushd $(BPA_OPERATOR) && make docker_bmh_e2e && make deploy && popd
+bpa_op_install_e2e:
+       pushd $(BPA_OPERATOR) && make docker_e2e && make deploy && popd
 
 bpa_op_delete:
        pushd $(BPA_OPERATOR) && make delete && popd
@@ -88,12 +98,17 @@ bpa_op_e2e_vm:
 bpa_op_e2e_bmh:
        pushd $(BPA_OPERATOR) && make e2etest_bmh && popd
 
+bpa_op_e2e_virtletvm:
+       pushd $(BPA_OPERATOR) && make e2etest_virtletvm && popd
+
 bpa_op_unit:
        pushd $(BPA_OPERATOR) && make unit_test && popd
 
-bpa_op_vm_verifier: bpa_op_install bpa_op_e2e_vm
+bpa_op_vm_verifier: bpa_op_install_e2e bpa_op_e2e_vm
 
-bpa_op_bmh_verifier: bpa_op_install_bmh_e2e bpa_op_e2e_bmh
+bpa_op_bmh_verifier: bpa_op_install_e2e bpa_op_e2e_bmh
+
+bpa_op_virtletvm_verifier: bpa_op_install bpa_op_e2e_virtletvm
 
 bpa_op_all: bm_all bpa_op_install
 
@@ -137,12 +152,20 @@ verify_all: prerequisite \
 verifier: verify_all
 
 verify_nestedk8s: prerequisite \
-       kud_bm_deploy \
-       sdwan_verifier
+       kud_vm_deploy \
+       bpa_op_virtletvm_verifier \
+       kud_bm_reset \
+       clean_bm_packages
 
 bm_verify_nestedk8s: prerequisite \
-       kud_bm_deploy \
-       sdwan_verifier
+        kud_bm_deploy_e2e \
+        kud_bm_reset \
+       clean_bm_packages
+
+kud_bm_verifier: prerequisite \
+       kud_bm_deploy_e2e \
+       kud_bm_reset \
+       clean_bm_packages
 
 .PHONY: all bm_preinstall bm_install bashate