diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2017-09-20 17:27:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-20 17:27:43 +0000 |
| commit | c002052b471023e83ba716543db62b94a4a2bed5 (patch) | |
| tree | 385186ac0d98c4e939b71bba8e72cecfc311bb1d /docker/restapi | |
| parent | 63c4f79fda75a4f9f0bdc056e96bb8b5df563210 (diff) | |
| parent | 1e1fba3aa18ebcbff6746586654805a44e88e9fe (diff) | |
Merge "Enable Doctor testcase"
Diffstat (limited to 'docker/restapi')
| -rw-r--r-- | docker/restapi/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/restapi/thirdparty-requirements.txt | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/docker/restapi/Dockerfile b/docker/restapi/Dockerfile index 2c7560286..450d2ae08 100644 --- a/docker/restapi/Dockerfile +++ b/docker/restapi/Dockerfile @@ -12,7 +12,7 @@ RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass \ ruby ruby-bundler ruby-irb ruby-rdoc dnsmasq \ procps libxslt libxml2 zlib libffi && \ apk --no-cache add --virtual .build-deps --update \ - python-dev build-base linux-headers libffi-dev \ + python-dev python3-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev \ ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev && \ git clone --depth 1 https://github.com/openstack/refstack-client.git /src/refstack-client && \ @@ -22,6 +22,10 @@ RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass \ -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ -e/src/refstack-client -rthirdparty-requirements.txt && \ + python3 -m pip install --no-cache-dir --src /src \ + -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \ + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ + doctor-tests && \ git clone --depth 1 https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \ (cd src/odl_test && git checkout -b $ODL_TAG) && \ git clone --depth 1 -b $FDS_TAG https://gerrit.opnfv.org/gerrit/fds /src/fds && \ diff --git a/docker/restapi/thirdparty-requirements.txt b/docker/restapi/thirdparty-requirements.txt index 0a9f2a101..618f750be 100644 --- a/docker/restapi/thirdparty-requirements.txt +++ b/docker/restapi/thirdparty-requirements.txt @@ -2,4 +2,5 @@ baro_tests sdnvpn sfc promise +doctor-tests;python_version>='3.0' domino |