diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2018-06-19 15:24:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-06-19 15:24:52 +0000 |
| commit | b529f96a28d8aeba253cd2cf4b301915fac28c39 (patch) | |
| tree | 0097d6603018be8b543b10a7df55222347cdb0d5 /docker/core/Dockerfile | |
| parent | a695d43010cb7096c0e1291a4f0d50b6abea7400 (diff) | |
| parent | 7cdab4c61f09db66dc0c0a157d90e8ef56bcfa5b (diff) | |
Merge "Add functest in upper-constraints"
Diffstat (limited to 'docker/core/Dockerfile')
| -rw-r--r-- | docker/core/Dockerfile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index cb44105af..390b00d85 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -9,12 +9,12 @@ RUN apk --no-cache add --update \ apk --no-cache add --virtual .build-deps --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 \ - > upper-constraints.txt && \ + wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH | \ + sed -E /#egg=functest/d > upper-constraints.txt && \ git clone https://gerrit.opnfv.org/gerrit/functest /src/functest && \ (cd /src/functest && git fetch origin $BRANCH && git checkout FETCH_HEAD) && \ pip install --no-cache-dir --src /src -cupper-constraints.txt \ - -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ + -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \ /src/functest && \ rm -r upper-constraints.txt /src/functest && \ cp /usr/lib/python2.7/site-packages/functest/ci/logging.ini /usr/lib/python2.7/site-packages/xtesting/ci/ && \ |