Stop using master for pip
authorCédric Ollivier <cedric.ollivier@orange.com>
Tue, 5 Sep 2017 09:29:10 +0000 (11:29 +0200)
committerCédric Ollivier <cedric.ollivier@orange.com>
Tue, 5 Sep 2017 09:31:58 +0000 (11:31 +0200)
Rally cannot work via latest pip:
  [r.name.lower() for r in pip.req.parse_requirements(
  rally AttributeError: 'module' object has no attribute 'req'

Badly it forbids building containers from a gerrit change.

Change-Id: Ie60344b2a7793729823643ba2c1d3c30500d56c4
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
docker/core/Dockerfile

index 0ab809a..172dbb9 100644 (file)
@@ -13,9 +13,6 @@ RUN apk --no-cache add --update \
     wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \
         sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \
         > upper-constraints.txt && \
-    pip install -U --no-cache-dir -cupper-constraints.txt \
-        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-        git+https://github.com/pypa/pip.git && \
     pip install --no-cache-dir --src /src -cupper-constraints.txt \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
         -e git+https://github.com/openstack/requirements@stable/ocata#egg=openstack_requirements && \