X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=cmd%2Fbpa-operator%2FMakefile;h=528f58ca9f845b078ab20c03910b04296a021935;hb=baff02fe219aa2fb8b7e075aef960785b57b7bc5;hp=9363e38d9a2a0555bbe3c809392b231ece77b947;hpb=49296cb7445207dc0ca8cb34cbe90ee29591530c;p=icn.git

diff --git a/cmd/bpa-operator/Makefile b/cmd/bpa-operator/Makefile
index 9363e38..528f58c 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  --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,7 +38,9 @@ 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
 
 .PHONY: delete
 delete:
@@ -33,12 +49,18 @@ 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
 
 .PHONY: unit_test
 unit_test:
 	go test ./pkg/controller/provisioning/
 
-.PHONY: e2etest
-e2etest:
-	./bpa_verifier.sh
+.PHONY: e2etest_bmh
+e2etest_bmh:
+	./e2etest/bpa_bmh_verifier.sh
+
+.PHONY: e2etest_virtletvm
+e2etest_virtletvm:
+	cd e2etest && ./bpa_virtletvm_verifier.sh