Merge "Replace ipmi with redfish-virtualmedia in VM site"

[icn.git] / Makefile

diff --git a/Makefile b/Makefile
index dbf0439..b5a8ea7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,89 +1,133 @@
 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
-SDWAN_VERIFIER_PATH:=$(CURDIR)/sdwan/test
-BPA_REST_API:=$(CURDIR)/cmd/bpa-restapi-agent
-
 
 help:
        @echo "  Targets:"
-       @echo "  test             -- run unit tests"
-       @echo "  installer        -- run icn installer"
-       @echo "  verifier         -- run verifier tests for CI & CD logs"
+       @echo "  jump_server      -- install jump server into this machine"
        @echo "  unit             -- run the unit tests"
+       @echo "  verifier         -- run verifier tests for CI & CD logs"
+       @echo "  vm_cluster       -- deploy VM compute cluster"
+       @echo "  pod11_cluster    -- deploy pod11 compute cluster"
        @echo "  help             -- this help output"
 
-all: bm_install
+install: jump_server
 
-bm_preinstall:
-       pushd $(BMDIR) && ./01_install_package.sh && ./02_configure.sh && ./03_launch_prereq.sh && popd
+# The jump server
 
-bm_install:
-       pushd $(METAL3DIR) && ./metal3.sh && popd
+jump_server: management_cluster \
+       tools \
+       ironic_bridge \
+       controllers
 
-bm_all: bm_preinstall bm_install
+jump_server_clean: ironic_bridge_clean \
+       management_cluster_clean
 
-kud_bm_deploy_mini:
-       pushd $(KUD_PATH) && ./kud_bm_launch.sh minimal && popd
+# The jump server requires a K8s cluster to install into
 
-kud_bm_deploy:
-       pushd $(KUD_PATH) && ./kud_bm_launch.sh all && popd
+management_cluster:
+       source user_config.sh && \
+       ./deploy/kud/kud_bm_launch.sh minimal
 
-metal3_prerequisite:
-       pushd $(METAL3VMDIR) && make bmh_install && popd
+management_cluster_clean:
+       ./deploy/kud/kud_bm_launch.sh reset
 
-metal3_vm:
-       pushd $(METAL3VMDIR) && make bmh && popd
+# Tools used during the installation of jump server components
 
-sdwan_verifier:
-       pushd $(SDWAN_VERIFIER_PATH) && bash sdwan_verifier.sh && popd
+tools: kustomize \
+       clusterctl \
+       flux_cli \
+       sops \
+       emcoctl
 
-bpa_op_install:
-       pushd $(BPA_OPERATOR) && make docker && make deploy && popd
+kustomize:
+       ./deploy/kustomize/kustomize.sh deploy
 
-bpa_op_delete:
-       pushd $(BPA_OPERATOR) && make delete && popd
+clusterctl:
+       ./deploy/clusterctl/clusterctl.sh deploy
 
-bpa_op_e2e:
-       pushd $(BPA_OPERATOR) && make e2etest && popd
+flux_cli:
+       ./deploy/flux-cli/flux-cli.sh deploy
 
-bpa_op_unit:
-       pushd $(BPA_OPERATOR) && make unit_test && popd
+sops:
+       ./deploy/sops/sops.sh deploy
 
-bpa_op_verifier: bpa_op_install bpa_op_e2e
+emcoctl: golang
+       ./deploy/emcoctl/emcoctl.sh deploy
 
-bpa_op_all: bm_all bpa_op_install
+golang:
+       ./deploy/golang/golang.sh deploy
 
-bpa_rest_api_install:
-       pushd $(BPA_REST_API) && make deploy && popd
+# Provisioning network configuration in the jump server
 
-bpa_rest_api_verifier:
-       pushd $(BPA_REST_API) && make e2e_test && popd
+ironic_bridge:
+       source user_config.sh && env && \
+       ./deploy/ironic/ironic.sh deploy-bridge
 
-bpa_rest_api_unit:
-       pushd $(BPA_REST_API) && make unit_test && popd
+ironic_bridge_clean:
+       ./deploy/ironic/ironic.sh clean-bridge
 
-bashate:
-       bashate -i E006,E003,E002,E010,E011,E042,E043 `find . -type f -not -path './cmd/bpa-operator/vendor/*' -name *.sh`
+# Jump server components
+
+controllers: baremetal_operator \
+       cluster_api \
+       flux
+
+baremetal_operator: ironic cert_manager
+       ./deploy/baremetal-operator/baremetal-operator.sh deploy
+
+baremetal_operator_clean:
+       ./deploy/baremetal-operator/baremetal-operator.sh clean
+
+ironic:
+       ./deploy/ironic/ironic.sh deploy
+
+cert_manager:
+       ./deploy/cert-manager/cert-manager.sh deploy
+
+cluster_api:
+       ./deploy/cluster-api/cluster-api.sh deploy
 
-prerequisite:
-       pushd $(ENV) && ./cd_package_installer.sh && popd
+flux:
+       ./deploy/flux/flux.sh deploy
 
-verify_all: prerequisite \
-       metal3_prerequisite \
-       kud_bm_deploy_mini \
-       metal3_vm \
-       bpa_op_verifier \
-       bpa_rest_api_verifier
+# Example compute clusters
 
-verifier: verify_all
+pod11_cluster:
+       ./deploy/site/pod11/pod11.sh deploy
+       ./deploy/site/pod11/pod11.sh wait
+       ./deploy/kata/kata.sh test
+       ./deploy/addons/addons.sh test
 
-verify_nestedk8s: prerequisite \
-       kud_bm_deploy \
-       sdwan_verifier
+pod11_cluster_clean:
+       ./deploy/site/pod11/pod11.sh clean
 
-.PHONY: all bm_preinstall bm_install bashate
+vm_cluster:
+       ./deploy/site/vm/vm.sh deploy
+       ./deploy/site/vm/vm.sh wait
+       ./deploy/kata/kata.sh test
+       ./deploy/addons/addons.sh test
+
+vm_cluster_clean:
+       ./deploy/site/vm/vm.sh clean
+
+# Test targets
+
+unit: bashate
+
+bashate:
+       bashate -i E006,E003,E002,E010,E011,E042,E043 `find . -type f -not -path './ci/jjb/shell/*' -not -path './build/*' -name "*.sh"`
+
+verifier: vm_verifier
+
+vm_verifier: jump_server \
+       vm_cluster \
+       vm_cluster_clean \
+       jump_server_clean
+
+bm_verifier: jump_server \
+       pod11_cluster \
+       pod11_cluster_clean \
+       jump_server_clean
+
+SDWAN_VERIFIER_PATH:=$(CURDIR)/sdwan/test
+sdwan_verifier:
+       pushd $(SDWAN_VERIFIER_PATH) && bash sdwan_verifier.sh && popd