changes in kud_bm_launch.sh

[icn.git] / Makefile

diff --git a/Makefile b/Makefile
index 8b66788..3a875ca 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,8 @@
 SHELL:=/bin/bash
+ENV:=$(CURDIR)/env
 BMDIR:=$(CURDIR)/env/metal3
 METAL3DIR:=$(CURDIR)/deploy/metal3/scripts
+METAL3VMDIR:=$(CURDIR)/deploy/metal3-vm
 BPA_OPERATOR:=$(CURDIR)/cmd/bpa-operator/
 KUD_PATH:=$(CURDIR)/deploy/kud
 BPA_E2E_SETUP:=https://raw.githubusercontent.com/onap/multicloud-k8s/master/kud/hosting_providers/vagrant/setup.sh
@@ -23,8 +25,17 @@ bm_install:
 
 bm_all: bm_preinstall bm_install
 
-kud_download:
-       pushd $(KUD_PATH) && ./kud_launch.sh && popd
+kud_bm_deploy_mini:
+       pushd $(KUD_PATH) && ./kud_bm_launch.sh minimal && popd
+
+kud_bm_deploy:
+       pushd $(KUD_PATH) && ./kud_bm_launch.sh all && popd
+
+metal3_prerequisite:
+       pushd $(METAL3VMDIR) && make bmh_install && popd
+
+metal3_vm:
+       pushd $(METAL3VMDIR) && make bmh && popd
 
 bpa_op_install:
        pushd $(BPA_OPERATOR) && make docker && make deploy && popd
@@ -45,12 +56,17 @@ bpa_op_all: bm_all bpa_op_install
 bashate:
        bashate -i E006 `find . -name *.sh`
 
-ci_dummy_test:
-       $(info ************  TESTING ICN CD LOGS ************)
+prerequisite:
+       pushd $(ENV) && ./cd_package_installer.sh && popd
 
-verify_all: ci_dummy_test
+verify_all: prerequisite \
+       metal3_prerequisite \
+       kud_bm_deploy_mini \
+       metal3_vm
 
-verifer: verify_all
+verifier: verify_all
 
+verify_nestedk8s: prerequisite \
+       kud_bm_deploy
 
 .PHONY: all bm_preinstall bm_install bashate