git.delta.rocks / unique-network / refs/commits / ef7da6887d98

difftreelog

updating ci

akaryaginUSETECH2021-04-04parent: #d5d63ff.patch.diff
in: master

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
@@ -3,8 +3,8 @@
 docker-compose -f docker-compose-tests.yml up -d --build --force-recreate --no-deps
 
 # 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/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/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
+docker system prune --force
modifieddocker-compose-tests.ymldiffbeforeafterboth
before · docker-compose-tests.yml
1version: "3.5"23services:4  node_validator1:5    image: nft_node_test6    container_name: validator1_test7    ports:8      - 9944:99449    build:10      context: ./11      dockerfile: Dockerfile12#    volumes:13#      - ./chain-data:/chain-data14    networks:15      - node_test_network16    command: bash -c "/usr/local/bin/nft --dev --tmp --ws-external --rpc-external"1718  integration_tests:19    container_name: integration_test20    image: int_test21    build:22      context: ./23      dockerfile: Dockerfile-tests24    volumes:25      - ./tests/src/config_docker.ts:/nft_parachain/tests/src/config.ts26  #  command: bash -c 'while true; do sleep 20; df -h; done'27    networks:28      - node_test_network29    depends_on:30      - node_validator13132  unit_tests:33    container_name: unit_test34    image: nft_unit_test35    build:36      context: ./37      dockerfile: Dockerfile-unit38    container_name: unit_test39    networks:40      - node_test_network41   # command: bash -c 'while true; do sleep 20; df -h; done'42    command: bash -c 'cargo test'4344networks:45  node_test_network:46    name: node_test_network47    driver: bridge