diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-11-23 14:36:26 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-11-23 22:15:50 +0100 |
| commit | e185291f3a4e4c2a6df6eb2e3f462bf33997d1d2 (patch) | |
| tree | 0c3c04c419a6985ca112687efa7d7ca6ae2aadfb /docker | |
| parent | fe92e6b54c2c756f6deacf6aea9dce9db2d0ee52 (diff) | |
Remove iniparse and urllib3 dependencies
It also moves robotframework addons to the right containers.
Change-Id: I32a8e018bf84685cffc70a04e3736d948bc6d1c4
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
| -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 |
4 files changed, 13 insertions, 2 deletions
diff --git a/docker/features/thirdparty-requirements.txt b/docker/features/thirdparty-requirements.txt index a89fd226..927fd240 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 8eb82d77..ffe5c98d 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 f8a42c49..5b634b50 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 00000000..6d7ee122 --- /dev/null +++ b/docker/smoke/thirdparty-requirements.txt @@ -0,0 +1,3 @@ +robotframework-httplibrary +robotframework-requests +robotframework-sshlibrary;python_version=='2.7' |