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
1#!/bin/bash1#!/bin/bash
2
3#docker-compose -f docker-compose-tests.yml up -d --build --force-recreate --no-deps
24
3docker-compose -f docker-compose-tests.yml up -d --build --force-recreate --no-deps5docker-compose -f docker-compose-tests.yml up -d --build
46
5# validate if testing container finished7# validate if testing container finished
6while [ "$(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 & \8while [ "$(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 & \
7while [ "$(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.log9while [ "$(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
8docker-compose -f docker-compose-tests.yml down -v10docker-compose -f docker-compose-tests.yml down -v
9echo "Wrokflow finished"11echo "Workflow finished"
10docker system prune --force12docker system prune --force
13
modifieddocker-compose-tests.ymldiffbeforeafterboth
--- a/docker-compose-tests.yml
+++ b/docker-compose-tests.yml
@@ -21,14 +21,16 @@
     build:
       context: ./
       dockerfile: Dockerfile-tests
-      volumes:
+    volumes:
       - ./tests/src/config_docker.ts:/nft_parachain/tests/src/config.ts
+      - /home/polkadot/mochawesome-report:/nft_parachain/tests/mochawesome-report
+  #  command: bash -c 'while true; do sleep 20; df -h; done'
     networks:
       - node_test_network
     depends_on:
       - node_validator1
 
-   unit_tests:
+  unit_tests:
     container_name: unit_test
     image: nft_unit_test
     build:
@@ -43,4 +45,4 @@
 networks:
   node_test_network:
     name: node_test_network
-    driver: bridge
\ No newline at end of file
+    driver: bridge