From eae42ef7a208b209993a50cd53103669355a9384 Mon Sep 17 00:00:00 2001
From: Itohan <itohan.ukponmwan@intel.com>
Date: Tue, 19 Nov 2019 15:24:39 -0800
Subject: [PATCH] Updated E2E test

- Print out job pod logs in e2etest
- Build image for bmh_e2e

Change-Id: I7b5807804d33f40827284254ed23509690b0fc25
---
 Makefile                                     |  5 ++++-
 cmd/bpa-operator/Makefile                    | 15 +++++++++++++++
 cmd/bpa-operator/e2etest/bpa_bmh_verifier.sh |  7 +++++++
 cmd/bpa-operator/e2etest/bpa_vm_verifier.sh  |  7 +++++++
 4 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 22e13fd..d4cd38a 100644
--- a/Makefile
+++ b/Makefile
@@ -76,6 +76,9 @@ sdwan_verifier:
 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_delete:
 	pushd $(BPA_OPERATOR) && make delete && popd
 
@@ -90,7 +93,7 @@ bpa_op_unit:
 
 bpa_op_vm_verifier: bpa_op_install bpa_op_e2e_vm
 
-bpa_op_bmh_verifier: bpa_op_install bpa_op_e2e_bmh
+bpa_op_bmh_verifier: bpa_op_install_bmh_e2e bpa_op_e2e_bmh
 
 bpa_op_all: bm_all bpa_op_install
 
diff --git a/cmd/bpa-operator/Makefile b/cmd/bpa-operator/Makefile
index 1f22cad..0886aea 100644
--- a/cmd/bpa-operator/Makefile
+++ b/cmd/bpa-operator/Makefile
@@ -16,6 +16,21 @@ docker:
          	-t github.com/onap/multicloud-k8s:latest . -f kud/build/Dockerfile
 	rm -rf multicloud-k8s
 
+docker_bmh_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 \
+        	--build-arg KUD_PLUGIN_ENABLED=true \
+        	-t github.com/onap/multicloud-k8s:latest . -f kud/build/Dockerfile
+	rm -rf multicloud-k8s
 
 .PHONY: deploy
 deploy:
diff --git a/cmd/bpa-operator/e2etest/bpa_bmh_verifier.sh b/cmd/bpa-operator/e2etest/bpa_bmh_verifier.sh
index d256fd2..ea50dfd 100755
--- a/cmd/bpa-operator/e2etest/bpa_bmh_verifier.sh
+++ b/cmd/bpa-operator/e2etest/bpa_bmh_verifier.sh
@@ -38,6 +38,13 @@ else
 fi
 
 
+#Print logs of Job Pod
+jobPod=$(kubectl get pods|grep kud-test-bmh-cluster)
+podName=$(echo $jobPod | cut -d " " -f 1)
+printf "\nNow Printing Job pod logs\n"
+kubectl logs $podName
+
+#Tear down setup
 printf "\n\nBeginning BMH E2E Test Teardown\n\n"
 kubectl delete -f e2etest/test_bmh_provisioning_cr.yaml
 kubectl delete job kud-test-bmh-cluster
diff --git a/cmd/bpa-operator/e2etest/bpa_vm_verifier.sh b/cmd/bpa-operator/e2etest/bpa_vm_verifier.sh
index 8b2e2ae..bd255b8 100755
--- a/cmd/bpa-operator/e2etest/bpa_vm_verifier.sh
+++ b/cmd/bpa-operator/e2etest/bpa_vm_verifier.sh
@@ -97,6 +97,13 @@ else
 fi
 
 
+#Print logs of Job Pod
+jobPod=$(kubectl get pods|grep kud-cluster-test)
+podName=$(echo $jobPod | cut -d " " -f 1)
+printf "\nNow Printing Job pod logs\n"
+kubectl logs $podName
+
+#Teardown Setup
 printf "\n\nBeginning E2E Test Teardown\n\n"
 kubectl delete -f e2etest/e2e_test_provisioning_cr.yaml
 kubectl delete job kud-cluster-test
-- 
2.16.6