git.delta.rocks / unique-network / refs/commits / 9cfe6fdf32d6

difftreelog

Merge pull request #143 from usetech-llc/ci_patch

usetech-llc2021-04-05parents: #26015a9 #cf466fd.patch.diff
in: master
Ci patch

3 files changed

modifiedDockerfile-testsdiffbeforeafterboth
--- a/Dockerfile-tests
+++ b/Dockerfile-tests
@@ -20,11 +20,14 @@
       [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
       nvm install v15.0.1 && \
       nvm use v15.0.1 && \
-      npm install --save @polkadot/api
+      npm install --save @polkadot/api && \ 
+      npm install --save-dev mochawesome
 
 CMD export NVM_DIR="$HOME/.nvm" && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
     cd tests && \
-    npm install --global yarn && \
+    npm install --global yarn && \ 
+    yarn add mochawesome && \
     yarn install && \
-    yarn test
+    yarn test --reporter mochawesome
+   # yarn test
modifiedci_node.shdiffbeforeafterboth
--- a/ci_node.sh
+++ b/ci_node.sh
@@ -1,10 +1,12 @@
 #!/bin/bash
 
-docker-compose -f docker-compose-tests.yml up -d --build --force-recreate --no-deps
+#docker-compose -f docker-compose-tests.yml up -d --build --force-recreate --no-deps
+
+docker-compose -f docker-compose-tests.yml up -d --build
 
 # validate if testing container finished
-while [ "$(docker ps | grep unit_test | wc -l)" -ge 1 ]; do echo "Unit test in process" && date && sleep 60; done && docker logs unit_test &> /home/polkadot/unit_test.log  & \
-while [ "$(docker ps | grep integration_test | wc -l)" -ge 1 ]; do echo "Integration test in process" && sleep 60; done && docker logs integration_test &> /home/polkadot/integration_test.log
+while [ "$(docker ps | grep unit_test | wc -l)" -ge 1 ]; do echo "Unit tests in process" && sleep 600; done && docker logs unit_test &> /home/polkadot/report-log/unit_test.log  & \
+while [ "$(docker ps | grep integration_test | wc -l)" -ge 1 ]; do echo "Integration tests in process" && sleep 600; done && docker logs integration_test &> /home/polkadot/report-log/integration_test.log
 docker-compose -f docker-compose-tests.yml down -v
-echo "Wrokflow finished"
-docker system prune --force
\ No newline at end of file
+echo "Workflow finished"
+docker system prune --force
modifieddocker-compose-tests.ymldiffbeforeafterboth
21 build:21 build:
22 context: ./22 context: ./
23 dockerfile: Dockerfile-tests23 dockerfile: Dockerfile-tests
24 volumes:24 volumes:
25 - ./tests/src/config_docker.ts:/nft_parachain/tests/src/config.ts25 - ./tests/src/config_docker.ts:/nft_parachain/tests/src/config.ts
26 - /home/polkadot/mochawesome-report:/nft_parachain/tests/mochawesome-report
27 # command: bash -c 'while true; do sleep 20; df -h; done'
26 networks:28 networks:
27 - node_test_network29 - node_test_network
28 depends_on:30 depends_on:
29 - node_validator131 - node_validator1
3032
31 unit_tests:33 unit_tests:
32 container_name: unit_test34 container_name: unit_test
33 image: nft_unit_test35 image: nft_unit_test
34 build:36 build:
43networks:45networks:
44 node_test_network:46 node_test_network:
45 name: node_test_network47 name: node_test_network
46 driver: bridge48 driver: bridge
49