aboutsummaryrefslogtreecommitdiffstats
path: root/docker/restapi/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/restapi/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/restapi/Dockerfile')
-rw-r--r--docker/restapi/Dockerfile10
1 files changed, 5 insertions, 5 deletions
diff --git a/docker/restapi/Dockerfile b/docker/restapi/Dockerfile
index 602e19c73..a74e8a88f 100644
--- a/docker/restapi/Dockerfile
+++ b/docker/restapi/Dockerfile
@@ -1,10 +1,10 @@
FROM opnfv/functest-core
ARG BRANCH=master
-ARG OPENSTACK_TAG=stable/ocata
-ARG ODL_TAG=e12ba90cd27577c4c6c70ee54f7d599b5f6777ba
+ARG OPENSTACK_TAG=stable/pike
+ARG ODL_TAG=master
ARG FDS_TAG=master
-ARG REFSTACK_TAG=4e187b07672dd1c41cb7c94658f1c91edebf53a2
+ARG REFSTACK_TAG=master
ARG VIMS_TAG=stable
COPY thirdparty-requirements.txt thirdparty-requirements.txt
@@ -17,7 +17,6 @@ RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass \
ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-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 && \
git clone https://github.com/openstack/refstack-client.git /src/refstack-client && \
(cd src/refstack-client && git checkout $REFSTACK_TAG) && \
@@ -34,7 +33,8 @@ RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass \
git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwater-live-test /src/vims-test && \
ln -s /src/tempest /src/refstack-client/.tempest && \
virtualenv --system-site-packages /src/tempest/.venv && \
- (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) && \
(cd /src/vims-test && bundle config build.nokogiri --use-system-libraries && bundle install --system) && \
npm -g install npm@latest && \
rm -r upper-constraints.txt thirdparty-requirements.txt /src/refstack-client/.git /src/odl_test/.git \