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 wait command to VM e2etest site
[icn.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
e32a5ac
..
6ed7b15
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-23,6
+23,7
@@
install: jump_server \
jump_server: package_prerequisite \
kud_bm_deploy_mini \
bmh_install \
jump_server: package_prerequisite \
kud_bm_deploy_mini \
bmh_install \
+ capi_install \
bpa_op_install \
bpa_rest_api_install
bpa_op_install \
bpa_rest_api_install
@@
-31,8
+32,8
@@
package_prerequisite:
bmh_clean:
pushd $(METAL3DIR) && ./01_metal3.sh deprovision && \
bmh_clean:
pushd $(METAL3DIR) && ./01_metal3.sh deprovision && \
- ./03_verify_deprovisioning.sh && ./01_metal3.sh clean && \
- ./01_metal3.sh remove && popd
+ ./03_verify_deprovisioning.sh && ./01_metal3.sh clean &&
popd &&
\
+ ./deploy/baremetal-operator/baremetal-operator.sh clean
bmh_clean_host:
pushd $(BMDIR) && ./06_host_cleanup.sh && popd
bmh_clean_host:
pushd $(BMDIR) && ./06_host_cleanup.sh && popd
@@
-47,12
+48,12
@@
clean_bm_packages:
bmh_preinstall:
source user_config.sh && env && \
bmh_preinstall:
source user_config.sh && env && \
- pushd $(BMDIR) && ./02_configure.sh && \
- ./
03_launch_prereq.sh && popd
+ pushd $(BMDIR) && ./02_configure.sh &&
popd &&
\
+ ./
deploy/ironic/ironic.sh deploy
bmh_install: bmh_preinstall
bmh_install: bmh_preinstall
-
source user_config.sh && env
&& \
- pushd $(METAL3DIR) && ./01_metal3.sh launch && popd
+
./deploy/cert-manager/cert-manager.sh deploy
&& \
+ ./deploy/baremetal-operator/baremetal-operator.sh deploy
bmh_provision:
source user_config.sh && env && \
bmh_provision:
source user_config.sh && env && \
@@
-81,15
+82,15
@@
kud_bm_deploy:
kud_bm_deploy_e2e:
pushd $(KUD_PATH) && ./kud_bm_launch.sh bm 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 v1 && popd
sdwan_verifier:
pushd $(SDWAN_VERIFIER_PATH) && bash sdwan_verifier.sh && popd
kud_bm_reset:
pushd $(KUD_PATH) && ./kud_bm_launch.sh reset v1 && popd
sdwan_verifier:
pushd $(SDWAN_VERIFIER_PATH) && bash sdwan_verifier.sh && popd
+capi_install:
+ ./deploy/cluster-api/cluster-api.sh deploy
+
bpa_op_install:
pushd $(BPA_OPERATOR) && make docker && make deploy && popd
bpa_op_install:
pushd $(BPA_OPERATOR) && make docker && make deploy && popd
@@
-102,18
+103,11
@@
bpa_op_delete:
bpa_op_e2e_bmh:
pushd $(BPA_OPERATOR) && make e2etest_bmh && popd
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_bmh_verifier: bpa_op_install_e2e bpa_op_e2e_bmh
bpa_op_unit:
pushd $(BPA_OPERATOR) && make unit_test && popd
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
-
bpa_rest_api_install:
pushd $(BPA_REST_API) && make deploy && popd
bpa_rest_api_install:
pushd $(BPA_REST_API) && make deploy && popd
@@
-146,12
+140,6
@@
bm_verifer: package_prerequisite \
verifier: bm_verifer
verifier: bm_verifer
-verify_nestedk8s: prerequisite \
- kud_vm_deploy \
- bpa_op_virtletvm_verifier \
- kud_bm_reset \
- clean_bm_packages
-
bm_verify_nestedk8s: prerequisite \
kud_bm_deploy_e2e \
kud_bm_reset \
bm_verify_nestedk8s: prerequisite \
kud_bm_deploy_e2e \
kud_bm_reset \