Code Review
/
icn.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add last round of addons to e2etest site
[icn.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
3fca41b
..
b02b771
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-2,7
+2,6
@@
SHELL:=/bin/bash
ENV:=$(CURDIR)/env
BMDIR:=$(CURDIR)/env/metal3
METAL3DIR:=$(CURDIR)/deploy/metal3/scripts
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
SDWAN_VERIFIER_PATH:=$(CURDIR)/sdwan/test
BPA_OPERATOR:=$(CURDIR)/cmd/bpa-operator/
KUD_PATH:=$(CURDIR)/deploy/kud
SDWAN_VERIFIER_PATH:=$(CURDIR)/sdwan/test
@@
-12,25
+11,24
@@
BOOTLOADER_ENV:=$(CURDIR)/env/ubuntu/bootloader-env
help:
@echo " Targets:"
@echo " test -- run unit tests"
help:
@echo " Targets:"
@echo " test -- run unit tests"
- @echo " installer -- run icn installer"
+ @echo " jump_server -- install jump server into this machine"
+ @echo " cluster -- provision cluster(s)"
@echo " verifier -- run verifier tests for CI & CD logs"
@echo " unit -- run the unit tests"
@echo " help -- this help output"
@echo " verifier -- run verifier tests for CI & CD logs"
@echo " unit -- run the unit tests"
@echo " help -- this help output"
-install: package_prerequisite \
+install: jump_server \
+ bmh_provision
+
+jump_server: package_prerequisite \
kud_bm_deploy_mini \
kud_bm_deploy_mini \
- bmh_all \
+ bmh_
inst
all \
bpa_op_install \
bpa_rest_api_install
package_prerequisite:
pushd $(BMDIR) && ./01_install_package.sh && popd
bpa_op_install \
bpa_rest_api_install
package_prerequisite:
pushd $(BMDIR) && ./01_install_package.sh && popd
-bmh_preinstall:
- source user_config.sh && env && \
- pushd $(BMDIR) && ./02_configure.sh && \
- ./03_launch_prereq.sh && popd
-
bmh_clean:
pushd $(METAL3DIR) && ./01_metal3.sh deprovision && \
./03_verify_deprovisioning.sh && ./01_metal3.sh clean && \
bmh_clean:
pushd $(METAL3DIR) && ./01_metal3.sh deprovision && \
./03_verify_deprovisioning.sh && ./01_metal3.sh clean && \
@@
-47,35
+45,44
@@
clean_bm_packages:
pushd $(BOOTLOADER_ENV) && \
./02_clean_bootloader_package_req.sh --bm-cleanall && popd
pushd $(BOOTLOADER_ENV) && \
./02_clean_bootloader_package_req.sh --bm-cleanall && popd
-bmh_install:
+bmh_preinstall:
+ source user_config.sh && env && \
+ pushd $(BMDIR) && ./02_configure.sh && \
+ ./03_launch_prereq.sh && popd
+
+bmh_install: bmh_preinstall
source user_config.sh && env && \
source user_config.sh && env && \
- pushd $(METAL3DIR) && ./01_metal3.sh launch && \
- ./01_metal3.sh provision && ./02_verify.sh && popd
+ pushd $(METAL3DIR) && ./01_metal3.sh launch && popd
-bmh_all: bmh_preinstall bmh_install
+bmh_provision:
+ source user_config.sh && env && \
+ pushd $(METAL3DIR) && ./01_metal3.sh provision && \
+ ./02_verify.sh && popd
+
+bmh_all: bmh_install bmh_provision
clean_all: bmh_clean \
bmh_clean_host \
kud_bm_reset \
clean_packages
clean_all: bmh_clean \
bmh_clean_host \
kud_bm_reset \
clean_packages
+cluster_provision:
+ pushd $(BPA_OPERATOR) && make provision && popd
+
+cluster: bmh_provision \
+ cluster_provision
+
kud_bm_deploy_mini:
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:
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:
kud_bm_deploy_e2e:
- pushd $(KUD_PATH) && ./kud_bm_launch.sh bm && popd
+ pushd $(KUD_PATH) && ./kud_bm_launch.sh bm
v2
&& popd
kud_bm_reset:
kud_bm_reset:
- pushd $(KUD_PATH) && ./kud_bm_launch.sh reset && popd
-
-metal3_prerequisite:
- pushd $(METAL3VMDIR) && make bmh_install && popd
-
-metal3_vm:
- pushd $(METAL3VMDIR) && make bmh && popd
+ pushd $(KUD_PATH) && ./kud_bm_launch.sh reset v1 && popd
sdwan_verifier:
pushd $(SDWAN_VERIFIER_PATH) && bash sdwan_verifier.sh && popd
sdwan_verifier:
pushd $(SDWAN_VERIFIER_PATH) && bash sdwan_verifier.sh && popd
@@
-83,26
+90,19
@@
sdwan_verifier:
bpa_op_install:
pushd $(BPA_OPERATOR) && make docker && make deploy && popd
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
bpa_op_delete:
pushd $(BPA_OPERATOR) && make delete && popd
-bpa_op_e2e_vm:
- pushd $(BPA_OPERATOR) && make e2etest_vm && popd
-
bpa_op_e2e_bmh:
pushd $(BPA_OPERATOR) && make e2etest_bmh && popd
bpa_op_unit:
pushd $(BPA_OPERATOR) && make unit_test && popd
bpa_op_e2e_bmh:
pushd $(BPA_OPERATOR) && make e2etest_bmh && popd
bpa_op_unit:
pushd $(BPA_OPERATOR) && make unit_test && popd
-bpa_op_vm_verifier: bpa_op_install bpa_op_e2e_vm
-
-bpa_op_bmh_verifier: bpa_op_install_bmh_e2e bpa_op_e2e_bmh
-
-bpa_op_all: bm_all bpa_op_install
+bpa_op_bmh_verifier: bpa_op_install_e2e bpa_op_e2e_bmh
bpa_rest_api_install:
pushd $(BPA_REST_API) && make deploy && popd
bpa_rest_api_install:
pushd $(BPA_REST_API) && make deploy && popd
@@
-134,24
+134,16
@@
bm_verifer: package_prerequisite \
bpa_rest_api_verifier \
clean_all
bpa_rest_api_verifier \
clean_all
-verify_all: prerequisite \
- metal3_prerequisite \
- kud_bm_deploy_mini \
- metal3_vm \
- bpa_op_vm_verifier \
- bpa_rest_api_verifier
-
-verifier: verify_all
-
-verify_nestedk8s: prerequisite \
- kud_bm_deploy \
- sdwan_verifier
+verifier: bm_verifer
bm_verify_nestedk8s: prerequisite \
kud_bm_deploy_e2e \
bm_verify_nestedk8s: prerequisite \
kud_bm_deploy_e2e \
- sdwan_verifier \
kud_bm_reset \
clean_bm_packages
kud_bm_reset \
clean_bm_packages
-.PHONY: all bm_preinstall bm_install bashate
+kud_bm_verifier: prerequisite \
+ kud_bm_deploy_e2e \
+ kud_bm_reset \
+ clean_bm_packages
+.PHONY: all bm_preinstall bm_install bashate