diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 188f0b0f..c61cdf2a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,8 +6,8 @@ include: - template: Secret-Detection.gitlab-ci.yml stages: - - dockerize - python-test + - dockerize - build - test @@ -69,10 +69,6 @@ dockerize-mainnet: test-e2e: stage: python-test - variables: - IMAGE: $CI_REGISTRY_IMAGE/mainnet/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA - dependencies: - - dockerize-mainnet before_script: - docker info - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY @@ -92,8 +88,11 @@ test-e2e: - python3 main.py --start btc hive - docker ps -a - python3 -m pytest test_btc_init_state.py test_hive_inital_state.py - - docker pull $IMAGE - - PP_CONTAINER_ID=$(docker run -d -v /peerplays-utils/peerplays-qa-environment/peerplays/config.ini:/home/peerplays/peerplays-network/witness_node_data_dir/config.ini -v /peerplays-utils/peerplays-qa-environment/peerplays/genesis.json:/home/peerplays/peerplays-network/genensis.json -v /peerplays-utils/peerplays-qa-environment/peerplays/init_network.sh:/home/peerplays/peerplays-network/init_network.sh $IMAGE) + - docker pull registry.gitlab.com/pbsa/peerplays/mainnet/feature-python-e2e-tests:943e02cdcd9fb8a90137851635b998cf1b4f622c + - PP_CONTAINER_ID=$(docker run -d -v /peerplays-utils/peerplays-qa-environment/peerplays/config.ini:/home/peerplays/peerplays-network/witness_node_data_dir/config.ini -v /peerplays-utils/peerplays-qa-environment/peerplays/genesis.json:/home/peerplays/peerplays-network/genensis.json -v /peerplays-utils/peerplays-qa-environment/peerplays/init_network.sh:/home/peerplays/peerplays-network/init_network.sh registry.gitlab.com/pbsa/peerplays/mainnet/feature-python-e2e-tests:943e02cdcd9fb8a90137851635b998cf1b4f622c) + - echo Milo + - echo $PP_CONTAINER_ID + - echo Milos - docker ps -a - docker exec $PP_CONTAINER_ID sh -c ./init-network.sh - python3 -m pytest test_pp_inital_state.py