diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2017-09-14 20:56:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-14 20:56:19 +0000 |
| commit | 890076da4b4d80c392c7e952282e9c721508b0d6 (patch) | |
| tree | 318c5fffd6a7661fb3ecc5b7b12b669ea633730e | |
| parent | 2eeea59953d477b1bb9cc3167426f547af2ba9f8 (diff) | |
| parent | a000736923730ef5cdcc9eb2a4871a4017bd2d09 (diff) | |
Merge "Override tempest upper-constraints in functest-parser"
| -rw-r--r-- | docker/parser/Dockerfile | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/docker/parser/Dockerfile b/docker/parser/Dockerfile index e0dc0d5c..a28a1f5b 100644 --- a/docker/parser/Dockerfile +++ b/docker/parser/Dockerfile @@ -11,18 +11,17 @@ RUN apk --no-cache add --update \ python-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev && \ wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \ - sed /^heat-translator=/d | sed /^tosca-parser=/d \ + sed /^heat-translator=/d | sed /^tosca-parser=/d | \ + sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \ > upper-constraints.txt && \ - pip install --src /src -cupper-constraints.txt \ + 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 && \ + -e git+https://github.com/openstack/requirements@$OPENSTACK_TAG#egg=openstack_requirements && \ git clone --depth 1 https://github.com/openstack/rally.git -b $RALLY_TAG /src/rally && \ - update-requirements -s --source /src/openstack-requirements /src/rally && \ - pip install --src /src -cupper-constraints.txt \ - -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ - /src/rally && \ - pip install --no-cache-dir --src /src \ - -cupper-constraints.txt \ + update-requirements -s --source /src/openstack-requirements /src/rally/ && \ + pip install --no-cache-dir --src /src -cupper-constraints.txt \ + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH /src/rally && \ + pip install --no-cache-dir --src /src -cupper-constraints.txt \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \ git+https://gerrit.opnfv.org/gerrit/parser#egg=heat-translator\&subdirectory=tosca2heat/heat-translator \ |