diff options
| -rw-r--r-- | docker/features/thirdparty-requirements.txt | 3 | ||||
| -rw-r--r-- | docker/restapi/thirdparty-requirements.txt | 3 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/smoke/thirdparty-requirements.txt | 3 | ||||
| -rw-r--r-- | requirements.txt | 5 | ||||
| -rw-r--r-- | upper-constraints.txt | 1 |
6 files changed, 13 insertions, 8 deletions
diff --git a/docker/features/thirdparty-requirements.txt b/docker/features/thirdparty-requirements.txt index a89fd2265..927fd2400 100644 --- a/docker/features/thirdparty-requirements.txt +++ b/docker/features/thirdparty-requirements.txt @@ -1,3 +1,6 @@ +robotframework-httplibrary +robotframework-requests +robotframework-sshlibrary;python_version=='2.7' # baro_tests sdnvpn sfc diff --git a/docker/restapi/thirdparty-requirements.txt b/docker/restapi/thirdparty-requirements.txt index 8eb82d77e..ffe5c98d4 100644 --- a/docker/restapi/thirdparty-requirements.txt +++ b/docker/restapi/thirdparty-requirements.txt @@ -1,3 +1,6 @@ +robotframework-httplibrary +robotframework-requests +robotframework-sshlibrary;python_version=='2.7' # baro_tests sdnvpn sfc diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index f8a42c491..5b634b506 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -7,6 +7,7 @@ ARG RALLY_TAG=stable/0.10 ARG OS_FAULTS_TAG=0.1.16 ARG REFSTACK_TAG=master +COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev && \ @@ -28,12 +29,13 @@ RUN apk --no-cache add --virtual .build-deps --update \ tempest /src/os-faults && \ pip install --no-cache-dir --src /src -cupper-constraints.txt \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ - -e/src/refstack-client /src/rally && \ + -e/src/refstack-client /src/rally -rthirdparty-requirements.txt && \ git clone https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \ (cd src/odl_test && git checkout $ODL_TAG) && \ ln -s /src/tempest /src/refstack-client/.tempest && \ virtualenv --system-site-packages /src/tempest/.venv && \ - rm -r upper-constraints.txt /src/refstack-client/.git /src/odl_test/.git /src/os-faults /src/rally && \ + rm -r upper-constraints.txt thirdparty-requirements.txt /src/refstack-client/.git /src/odl_test/.git \ + /src/os-faults /src/rally && \ mkdir -p /etc/rally && \ printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \ mkdir -p /var/lib/rally/database && rally db create && \ diff --git a/docker/smoke/thirdparty-requirements.txt b/docker/smoke/thirdparty-requirements.txt new file mode 100644 index 000000000..6d7ee1226 --- /dev/null +++ b/docker/smoke/thirdparty-requirements.txt @@ -0,0 +1,3 @@ +robotframework-httplibrary +robotframework-requests +robotframework-sshlibrary;python_version=='2.7' diff --git a/requirements.txt b/requirements.txt index a5d0e5aba..8c83f0a8a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,9 +13,6 @@ python-neutronclient>=6.3.0 # Apache-2.0 python-novaclient>=9.0.0 # Apache-2.0 requests>=2.14.2 # Apache-2.0 robotframework>=3.0 -robotframework-httplibrary -robotframework-requests -robotframework-sshlibrary;python_version=='2.7' scp dnspython>=1.14.0;python_version=='2.7' # http://www.dnspython.org/LICENSE dnspython3!=1.13.0,!=1.14.0,>=1.12.0;python_version>='3.0' # http://www.dnspython.org/LICENSE @@ -27,14 +24,12 @@ Flask-RESTful>=0.3.5 # BSD IPy flasgger # MIT mock>=2.0 # BSD -iniparse==0.4 PrettyTable<0.8,>=0.7.1 # BSD six>=1.9.0 # MIT snaps SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT paramiko>=2.0 # LGPLv2.1+ Jinja2!=2.9.0,!=2.9.1,!=2.9.2,!=2.9.3,!=2.9.4,>=2.8 # BSD License (3 clause) -urllib3>=1.21.1 # MIT httplib2>=0.7.5 # MIT oslo.serialization!=2.19.1,>=1.10.0 # Apache-2.0 oslo.utils>=3.20.0 # Apache-2.0 diff --git a/upper-constraints.txt b/upper-constraints.txt index 8a4f9e1c8..4bd83c4a7 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -10,7 +10,6 @@ git+https://gerrit.opnfv.org/gerrit/parser#egg=nfv-heattranslator&subdirectory=t git+https://gerrit.opnfv.org/gerrit/parser#egg=nfv-toscaparser&subdirectory=tosca2heat/tosca-parser -e git+https://gerrit.opnfv.org/gerrit/parser#egg=nfv-parser cloudify-rest-client===4.0 -iniparse===0.4 openbaton-cli===2.2.1b7 robotframework===3.0.2 robotframework-httplibrary===0.4.2 |