From f16ff172f020600b3371189468960ae3bb77fbbd Mon Sep 17 00:00:00 2001
From: zhangl <zhangl@us.ibm.com>
Date: Thu, 17 Aug 2023 18:31:36 +0000
Subject: [PATCH] Fix remote e2edev for kube test

Signed-off-by: zhangl <zhangl@us.ibm.com>
---
 test/Makefile              | 12 ++++++------
 test/gov/service_apireg.sh |  7 -------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index 53d3675cc..066f85756 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -330,19 +330,19 @@ test: clean $(ANAX_SOURCE)/anax run-dockerreg run-mgmthub run-test
 
 test-remote: clean $(ANAX_SOURCE)/anax run-dockerreg run-test copy-cert
 	@echo -e  "\nBootstrapping the exchange"
-	docker exec $(DOCKER_TEST_CNAME) bash -c "export $(TEST_VARS); /root/init_exchange.sh"
+	docker exec $(DOCKER_TEST_CNAME) bash -c "export $(TEST_VARS) NOKUBE=1; /root/init_exchange.sh"
 	@echo -e  "\nSetting up secrets in the vault"
-	docker exec $(DOCKER_TEST_CNAME) bash -c "export $(TEST_VARS) DOCKER_VAULT_CNAME=$(DOCKER_VAULT_CNAME); /root/setup_secrets.sh"
+	docker exec $(DOCKER_TEST_CNAME) bash -c "export $(TEST_VARS) NOKUBE=1 DOCKER_VAULT_CNAME=$(DOCKER_VAULT_CNAME); /root/setup_secrets.sh"
 	@echo -e  "\nStarting tests"
-	docker exec $(DOCKER_TEST_CNAME) bash -c "export $(TEST_VARS); /root/gov-combined.sh"
+	docker exec $(DOCKER_TEST_CNAME) bash -c "export $(TEST_VARS) NOKUBE=1; /root/gov-combined.sh"
 
 test-remote-prebuilt: clean run-dockerreg download-agbot-image run-test copy-cert
 	@echo -e  "\nBootstrapping the exchange"
-	docker exec $(DOCKER_TEST_CNAME) bash -c "export $(TEST_VARS); /root/init_exchange.sh"
+	docker exec $(DOCKER_TEST_CNAME) bash -c "export $(TEST_VARS) NOKUBE=1; /root/init_exchange.sh"
 	@echo -e  "\nSetting up secrets in the vault"
-	docker exec $(DOCKER_TEST_CNAME) bash -c "export $(TEST_VARS) DOCKER_VAULT_CNAME=$(DOCKER_VAULT_CNAME); /root/setup_secrets.sh"
+	docker exec $(DOCKER_TEST_CNAME) bash -c "export $(TEST_VARS) NOKUBE=1 DOCKER_VAULT_CNAME=$(DOCKER_VAULT_CNAME); /root/setup_secrets.sh"
 	@echo -e  "\nStarting tests"
-	docker exec $(DOCKER_TEST_CNAME) bash -c "export $(TEST_VARS); /root/gov-combined.sh"
+	docker exec $(DOCKER_TEST_CNAME) bash -c "export $(TEST_VARS) NOKUBE=1; /root/gov-combined.sh"
 
 copy-cert:
 	cp css.crt $(E2EDEVTEST_TEMPFS)/certs/css.crt
diff --git a/test/gov/service_apireg.sh b/test/gov/service_apireg.sh
index 307d0fd83..ad3287c2f 100755
--- a/test/gov/service_apireg.sh
+++ b/test/gov/service_apireg.sh
@@ -1412,10 +1412,6 @@ results "$RES"
 
 fi
 
-if [[ "$NOKUBE" == "1" ]]; then
-  echo -e "Skipping k8s policy creation"
-else
-
 read -d '' bpk8ssvc1def <<EOF
 {
   "label": "business policy for k8s-service1",
@@ -1499,9 +1495,6 @@ echo -e "Register business policy bp_k8s_embedded_ns for k8s-service-embedded-ns
 results "$RES"
 
 
-fi
-
-
 # ======================= Service Policies that use top level services ======================
 read -d '' nspoldef <<EOF
 {