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

difftreelog

updating ci

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

3 files changed

modifiedDockerfile-testsdiffbeforeafterboth
before · Dockerfile-tests
1# ===== Integration Tests ======234FROM ubuntu:18.045LABEL maintainer="UniqueNetwork.io"67RUN apt-get -y update; apt-get -y upgrade; apt-get -y install curl8910RUN mkdir nft_parachain11WORKDIR /nft_parachain1213COPY . .1415RUN apt-get -y update && \16      apt-get -y upgrade && \17      apt-get -y install curl && \18      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \19      export NVM_DIR="$HOME/.nvm" && \20      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \21      nvm install v15.0.1 && \22      nvm use v15.0.1 && \23      npm install --save @polkadot/api2425CMD export NVM_DIR="$HOME/.nvm" && \26    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \27    cd tests && \28    npm install --global yarn && \29    yarn install && \30    yarn test
after · Dockerfile-tests
1# ===== Integration Tests ======234FROM ubuntu:18.045LABEL maintainer="UniqueNetwork.io"67RUN apt-get -y update; apt-get -y upgrade; apt-get -y install curl8910RUN mkdir nft_parachain11WORKDIR /nft_parachain1213COPY . .1415RUN apt-get -y update && \16      apt-get -y upgrade && \17      apt-get -y install curl && \18      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \19      export NVM_DIR="$HOME/.nvm" && \20      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \21      nvm install v15.0.1 && \22      nvm use v15.0.1 && \23      npm install --save @polkadot/api && \ 24      npm install --save-dev mochawesome2526CMD export NVM_DIR="$HOME/.nvm" && \27    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \28    cd tests && \29    npm install --global yarn && 30    yarn add mochawesome && \31    yarn install && \32    yarn test --reporter mochawesome33   # 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
--- a/docker-compose-tests.yml
+++ b/docker-compose-tests.yml
@@ -23,6 +23,7 @@
       dockerfile: Dockerfile-tests
     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