Merge branch 'master' into dev-release-mgmt

open-horizon · Aug 18, 2023 · 786f9a0 · 786f9a0
2 parents 3317f49 + c08acda
commit 786f9a0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git 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
@@ -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
 {