diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2019-06-13 16:50:01 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-07-17 20:32:12 +0200 |
| commit | f377ca166f1e0f81b685e3a76ef0287cdc011cd1 (patch) | |
| tree | 01950a61457d2966d3974ef7544f39aef4f2202d /docker/Dockerfile | |
| parent | d57f3eefc23b2bdcc7eb70b19e09cfd22fc36e25 (diff) | |
Leverage on PBR
It fixes requirements and constraints by switching to PBR [1].
It synchronizes requirements with OpenStack stable/stein and then
adds constraints to pip calls.
It also updates flask-restful-swagger to conform with OpenStack
upper-constraints [2] and the pip API calls.
It updates the unit tests verifying a few package versions.
It stops checking unicodecsv in py3 env which is against the
requirements defined in OpenStack.
It also skips one test indirectly highlighting that the pip usage
is incorrect [3]
[1] http://testresults.opnfv.org/functest/dockerslicing/
[2] https://github.com/rantav/flask-restful-swagger/commit/fd418b50723fe1e79f495aa400a8e9f055a5be27
[3] https://github.com/pypa/pip/issues/3889
Change-Id: I635bdb9d7411e619cee911b633fa8ad591a393a0
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/Dockerfile')
| -rw-r--r-- | docker/Dockerfile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 31f7d5dfc..c46d2ce72 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -12,6 +12,7 @@ FROM ubuntu:16.04 LABEL image=opnfv/yardstick ARG BRANCH=master +ARG OPENSTACK_TAG=stable/stein # GIT repo directory ENV REPOS_DIR="/home/opnfv/repos" \ @@ -26,7 +27,10 @@ ENV YARDSTICK_REPO_DIR="${REPOS_DIR}/yardstick/" \ RUN apt-get update && apt-get install -y git python python-setuptools python-pip iputils-ping && apt-get -y autoremove && apt-get clean RUN easy_install -U setuptools==30.0.0 -RUN pip install appdirs==1.4.0 pyopenssl==17.5.0 openstacksdk==0.11.3 python-openstackclient==3.14.2 python-heatclient==1.14.0 ansible==2.5.5 +RUN pip install \ + -chttps://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt \ + -chttps://git.opnfv.org/yardstick/plain/upper-constraints.txt?h=$BRANCH \ + appdirs==1.4.0 pyopenssl==17.5.0 openstacksdk==0.11.3 python-heatclient==1.14.0 RUN mkdir -p ${REPOS_DIR} |