X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=Makefile;h=2f21037dcb0b2b93777a12eb1b21cebf4e599b78;hb=refs%2Fchanges%2F63%2F4463%2F3;hp=22bde16c7c963931ca95f228e66578c3508be7d8;hpb=6c64e47646e2fc21447b5a3ae3ff4fae9d556c0d;p=icn.git diff --git a/Makefile b/Makefile index 22bde16..2f21037 100644 --- a/Makefile +++ b/Makefile @@ -60,19 +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 && popd + pushd $(KUD_PATH) && ./kud_bm_launch.sh bm v2 && popd kud_vm_deploy: - pushd $(KUD_PATH) && ./kud_bm_launch.sh vm && popd + 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 @@ -86,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 @@ -104,9 +104,9 @@ bpa_op_e2e_virtletvm: 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 @@ -153,14 +153,19 @@ verifier: verify_all verify_nestedk8s: prerequisite \ kud_vm_deploy \ - sdwan_verifier \ - bpa_op_virtletvm_verifier + bpa_op_virtletvm_verifier \ + kud_bm_reset \ + clean_bm_packages bm_verify_nestedk8s: prerequisite \ kud_bm_deploy_e2e \ - sdwan_verifier \ 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