diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9b6e28d56..ad0698a7b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -39,12 +39,11 @@ test:unit: test:datanetwork-integration: stage: test - image: ubuntu:18.04 script: - apt-get update - - apt-get install -y libboost1.65-all-dev python3.7-dev - - pip install tox-travis - - tox -e datanetwork + - apt-get install -y libboost-all-dev + - python3.7 -m pip install tox-travis + - LIBTORRENT_URL=https://s3.amazonaws.com/files.lbry.io/python_libtorrent-1.2.4-py2.py3-none-any.whl tox -e datanetwork --recreate test:blockchain-integration: stage: test @@ -87,7 +86,7 @@ test:json-api: build:linux: extends: .build - image: ubuntu:16.04 + image: ubuntu:18.04 variables: OS: linux before_script: diff --git a/tox.ini b/tox.ini index 55a4f4d79..c9d0dae71 100644 --- a/tox.ini +++ b/tox.ini @@ -6,8 +6,9 @@ extras = test changedir = {toxinidir}/tests setenv = HOME=/tmp + LIBTORRENT_URL={env:LIBTORRENT_URL:https://s3.amazonaws.com/files.lbry.io/python_libtorrent-1.2.4-py3-none-any.whl} commands = - pip install https://s3.amazonaws.com/files.lbry.io/python_libtorrent-1.2.4-py3-none-any.whl + pip install {env:LIBTORRENT_URL} pip install https://github.com/rogerbinns/apsw/releases/download/3.30.1-r1/apsw-3.30.1-r1.zip \ --global-option=fetch \ --global-option=--version --global-option=3.30.1 --global-option=--all \