diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 61afce6e..08b1025a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,8 +7,9 @@ include: stages: - build - - test - dockerize + - python-test + - test build-mainnet: stage: build @@ -119,3 +120,29 @@ dockerize-testnet: manual timeout: 3h + +test-e2e: + stage: python-test + variables: + IMAGE: $CI_REGISTRY_IMAGE/mainnet/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA + before_script: + - docker info + - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY + script: + - git clone https://gitlab.com/PBSA/tools-libs/peerplays-utils.git + - cd peerplays-utils/peerplays-qa-environment + - git checkout origin/feature/python-e2e-tests-for-CI + - cd e2e-tests/ + - python3 -m venv venv + - source venv/bin/activate + - pip3 install -r requirements.txt + - python3 start.py --stop + - docker ps -a + - export COMPOSE_SERVICE_PEERPLAYS_BASE_IMAGE=$IMAGE + - python3 start.py --start all + - docker ps -a + - python3 start.py --stop + - deactivate + - docker ps -a + tags: + - python-tests diff --git a/Dockerfile b/Dockerfile index 7a229aa7..43db4a39 100644 --- a/Dockerfile +++ b/Dockerfile @@ -190,8 +190,6 @@ ADD . peerplays RUN \ cd peerplays && \ git submodule update --init --recursive && \ - git symbolic-ref --short HEAD && \ - git log --oneline -n 5 && \ mkdir build && \ cd build && \ cmake -DCMAKE_BUILD_TYPE=Release .. @@ -217,6 +215,3 @@ RUN chown peerplays:root -R /home/peerplays/peerplays-network EXPOSE 8090 # Peerplays P2P: EXPOSE 9777 - -# Peerplays -CMD ["./witness_node", "-d", "./witness_node_data_dir"]