X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=cmd%2Fbpa-operator%2FMakefile;h=1f24da4c64845a28c0828698d22d3ea1dce22b4b;hb=refs%2Fchanges%2F82%2F4482%2F3;hp=1f22cad1d3731749abeee0e76035a8acc615f605;hpb=b82ae6975d26581802457364993bee061350ae32;p=icn.git

diff --git a/cmd/bpa-operator/Makefile b/cmd/bpa-operator/Makefile
index 1f22cad..1f24da4 100644
--- a/cmd/bpa-operator/Makefile
+++ b/cmd/bpa-operator/Makefile
@@ -6,16 +6,30 @@ docker:
 	docker build --rm -t akraino.org/icn/bpa-operator:latest . -f build/Dockerfile
 	git clone https://github.com/onap/multicloud-k8s.git
 	cd multicloud-k8s && \
-	docker build  --network=host --rm \
-         	--build-arg http_proxy=${http_proxy} \
-         	--build-arg HTTP_PROXY=${HTTP_PROXY} \
-         	--build-arg https_proxy=${https_proxy} \
-         	--build-arg HTTPS_PROXY=${HTTPS_PROXY} \
-         	--build-arg no_proxy=${no_proxy} \
-         	--build-arg NO_PROXY=${NO_PROXY} \
-         	-t github.com/onap/multicloud-k8s:latest . -f kud/build/Dockerfile
+	docker build --network=host --rm \
+		--build-arg http_proxy=${http_proxy} \
+		--build-arg HTTP_PROXY=${HTTP_PROXY} \
+		--build-arg https_proxy=${https_proxy} \
+		--build-arg HTTPS_PROXY=${HTTPS_PROXY} \
+		--build-arg no_proxy=${no_proxy} \
+		--build-arg NO_PROXY=${NO_PROXY} \
+		-t github.com/onap/multicloud-k8s:latest . -f kud/build/Dockerfile
 	rm -rf multicloud-k8s
 
+docker_e2e:
+	docker build --rm -t akraino.org/icn/bpa-operator:latest . -f build/Dockerfile
+	git clone https://github.com/onap/multicloud-k8s.git
+	cd multicloud-k8s && \
+	docker build --network=host --rm \
+		--build-arg http_proxy=${http_proxy} \
+		--build-arg HTTP_PROXY=${HTTP_PROXY} \
+		--build-arg https_proxy=${https_proxy} \
+		--build-arg HTTPS_PROXY=${HTTPS_PROXY} \
+		--build-arg no_proxy=${no_proxy} \
+		--build-arg NO_PROXY=${NO_PROXY} \
+		--build-arg KUD_ENABLE_TESTS=true \
+		-t github.com/onap/multicloud-k8s:latest . -f kud/build/Dockerfile
+	rm -rf multicloud-k8s
 
 .PHONY: deploy
 deploy:
@@ -24,6 +38,7 @@ deploy:
 	kubectl apply -f deploy/role_binding.yaml
 	kubectl apply -f deploy/crds/provisioning-crd/bpa_v1alpha1_provisioning_crd.yaml
 	kubectl apply -f deploy/crds/software-crd/bpa_v1alpha1_software_crd.yaml
+	kubectl apply -f deploy/kud-installer.yaml
 	kubectl apply -f deploy/operator.yaml
 	kubectl create secret generic ssh-key-secret --from-file=id_rsa=/root/.ssh/id_rsa --from-file=id_rsa.pub=/root/.ssh/id_rsa.pub
 
@@ -34,6 +49,7 @@ delete:
 	kubectl delete -f deploy/role_binding.yaml
 	kubectl delete -f deploy/crds/provisioning-crd/bpa_v1alpha1_provisioning_crd.yaml
 	kubectl delete -f deploy/crds/software-crd/bpa_v1alpha1_software_crd.yaml
+	kubectl delete -f deploy/kud-installer.yaml
 	kubectl delete -f deploy/operator.yaml
 	kubectl delete secret ssh-key-secret
 
@@ -41,10 +57,11 @@ delete:
 unit_test:
 	go test ./pkg/controller/provisioning/
 
-.PHONY: e2etest_vm
-e2etest_vm:
-	./e2etest/bpa_vm_verifier.sh
-
 .PHONY: e2etest_bmh
 e2etest_bmh:
-	./e2etest/bpa_bmh_verifier.sh
+	./e2etest/bpa_bmh_verifier.sh provision
+	./e2etest/bpa_bmh_verifier.sh teardown
+
+.PHONY: provision
+provision:
+	./e2etest/bpa_bmh_verifier.sh provision