Browse Source

query-node: fix network-name

Mokhtar Naamani 4 years ago
parent
commit
fa2ceae725
3 changed files with 10 additions and 3 deletions
  1. 2 0
      .env
  2. 2 0
      query-node/.env
  3. 6 3
      query-node/run-tests.sh

+ 2 - 0
.env

@@ -1,3 +1,5 @@
+COMPOSE_PROJECT_NAME=joystream
+
 ###########################
 #     Common settings     #
 ###########################

+ 2 - 0
query-node/.env

@@ -1,3 +1,5 @@
+COMPOSE_PROJECT_NAME=joystream
+
 # Project name
 PROJECT_NAME=query_node
 

+ 6 - 3
query-node/run-tests.sh

@@ -7,8 +7,8 @@ cd $SCRIPT_PATH
 function cleanup() {
     # Show tail end of logs for the processor and indexer containers to
     # see any possible errors
-    (echo "## Processor Logs ##" && docker logs query-node_processor_1 --tail 50) || :
-    (echo "## Indexer Logs ##" && docker logs query-node_indexer_1 --tail 50) || :
+    (echo "## Processor Logs ##" && docker logs joystream_processor_1 --tail 50) || :
+    (echo "## Indexer Logs ##" && docker logs joystream_indexer_1 --tail 50) || :
     docker-compose down -v
 }
 
@@ -23,6 +23,9 @@ export WS_PROVIDER_ENDPOINT_URI=ws://joystream-node:9944/
 # typeorm commandline is used by db:migrate step below.
 ln -s ../../../../../node_modules/typeorm/cli.js generated/graphql-server/node_modules/.bin/typeorm || :
 
+# clean start
+docker-compose down -v
+
 docker-compose up -d db
 yarn db:migrate
 # docker-compose up -d redis
@@ -33,4 +36,4 @@ yarn db:migrate
 docker-compose up -d processor
 
 # Run tests
-ATTACH_TO_NETWORK=query-node_default ../tests/network-tests/run-tests.sh content-directory
+ATTACH_TO_NETWORK=joystream_default ../tests/network-tests/run-tests.sh content-directory