aboutsummaryrefslogtreecommitdiffstats
path: root/docker/features/Dockerfile
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-11-05 13:51:56 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2017-11-05 14:02:55 +0100
commit57970bac489b114ab0483580fef683ea99fe62f1 (patch)
tree56aa27f4935c7e11809e92891e5a7129f0bf2097 /docker/features/Dockerfile
parent4d95f152cda9c7a44df13025341d3d7d472d57c6 (diff)
Update Functest to OpenStack stable/pike
It updates setup.py, (test-)requirement.txt and upper-constraints.txt according to OpenStack requirements [1]. It disables all Features testcases as they are not synchronized with OpenStack stable/pike yet [2]. The docker functest-parser is simplified as it can be based on functest-core as both Functest and Parser leverage on OpenStack stable/pike. ODL_TAG and REFSTACK_TAG variables are set to master again. [1] http://git.openstack.org/cgit/openstack/requirements/log/?h=stable/pike [2] https://wiki.opnfv.org/display/functest/Requirements+management Change-Id: I23fa84f35244c1f4026abd89414b99576f042ee4 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/features/Dockerfile')
-rw-r--r--docker/features/Dockerfile6
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