`9cfe6fdf32d6`

diff tree log

Ci patch

3 files changed

modifiedDockerfile-testsdiff before after both

--- 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.shdiff before after both

--- 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.ymldiff before after both

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    networks:27      - node_test_network28    depends_on:29      - node_validator13031   unit_tests:32    container_name: unit_test33    image: nft_unit_test34    build:35      context: ./36      dockerfile: Dockerfile-unit37    container_name: unit_test38    networks:39      - node_test_network40   # command: bash -c 'while true; do sleep 20; df -h; done'41    command: bash -c 'cargo test'4243networks:44  node_test_network:45    name: node_test_network46    driver: bridge

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      - /home/polkadot/mochawesome-report:/nft_parachain/tests/mochawesome-report27  #  command: bash -c 'while true; do sleep 20; df -h; done'28    networks:29      - node_test_network30    depends_on:31      - node_validator13233  unit_tests:34    container_name: unit_test35    image: nft_unit_test36    build:37      context: ./38      dockerfile: Dockerfile-unit39    container_name: unit_test40    networks:41      - node_test_network42   # command: bash -c 'while true; do sleep 20; df -h; done'43    command: bash -c 'cargo test'4445networks:46  node_test_network:47    name: node_test_network48    driver: bridge