fixup! Add test-network sample test

Signed-off-by: Marcus Brandenburger <bur@zurich.ibm.com>
hyperledger · Jul 26, 2024 · 4236ad9 · 4236ad9
1 parent 713bdd0
commit 4236ad9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/samples/deployment/Makefile b/samples/deployment/Makefile
@@ -0,0 +1,12 @@
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+TOP = ../..
+include $(TOP)/build.mk
+
+DEPLOYMENT_SAMPLES = test-network
+
+build test clean:
+	$(foreach DIR, $(DEPLOYMENT_SAMPLES), $(MAKE) -C $(DIR) $@ || exit;)
+
diff --git a/samples/deployment/test-network/Makefile b/samples/deployment/test-network/Makefile
@@ -23,8 +23,8 @@ ercc-ecc-start:
 ercc-ecc-stop:
 	${DOCKER_COMPOSE} down
 
-clobber:
-	docker compose down
+clean:
+	docker compose down -v
 	./fabric-samples/test-network/network.sh down || true
 	rm -rf blockchain-explorer fabric-samples .env
 	docker system prune --force

diff --git a/samples/deployment/test-network/test.sh b/samples/deployment/test-network/test.sh
@@ -20,7 +20,7 @@ function cleanup() {
   echo "Cleanup"
   echo "########################################"
 
-  make -C "$FPC_PATH/samples/deployment/test-network" clobber
+  make -C "$FPC_PATH/samples/deployment/test-network" clean
 }
 
 function test_network_setup() {
@@ -134,7 +134,9 @@ function test_blockchain_explorer() {
    cd "$FPC_PATH/samples/deployment/test-network/blockchain-explorer"
    docker compose up -d
 
-   curl http://localhost:8080/
+   #curl http://localhost:8080/
+
+   docker compose down -v
 }
 
 function test_shutdown() {