diff options
Diffstat (limited to 'docker/features/Dockerfile')
| -rw-r--r-- | docker/features/Dockerfile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index ce2210edb..0d53655a5 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -1,7 +1,7 @@ FROM opnfv/functest-core ARG BRANCH=master -ARG OPENSTACK_TAG=stable/ocata +ARG OPENSTACK_TAG=stable/pike COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass && \ @@ -10,7 +10,6 @@ RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass && \ 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 \ @@ -19,7 +18,8 @@ RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass && \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ doctor-tests && \ npm -g install npm@latest && \ - (cd /src/promise/source && npm install) && \ + # the next line must be uncommented as soon as promise is synced with pike + # (cd /src/promise/source && npm install) && \ rm -r upper-constraints.txt thirdparty-requirements.txt && \ apk del .build-deps COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml |