diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2017-11-06 13:58:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-11-06 13:58:55 +0000 |
| commit | 806d9c521f9f1de9df3b9ad62002bb31e2b2a821 (patch) | |
| tree | 43f36948fd735c2084ae0f13b341fcd839d8e7b7 /docker/core | |
| parent | e491334942083a81dab0f3450a809e29b0687c31 (diff) | |
| parent | 57970bac489b114ab0483580fef683ea99fe62f1 (diff) | |
Merge "Update Functest to OpenStack stable/pike"
Diffstat (limited to 'docker/core')
| -rw-r--r-- | docker/core/Dockerfile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 1cf0c8545..91c0468cd 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.6 ARG BRANCH=master -ARG OPENSTACK_TAG=stable/ocata +ARG OPENSTACK_TAG=stable/pike ARG RALLY_TAG=stable/0.10 ARG OS_FAULTS_TAG=0.1.16 @@ -13,7 +13,6 @@ RUN apk --no-cache add --update \ openssl-dev libjpeg-turbo-dev && \ 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/ | \ - sed s/^requests===.*$/requests===2.13.0/ \ > upper-constraints.txt && \ pip install --no-cache-dir --src /src -cupper-constraints.txt \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ |