From 57970bac489b114ab0483580fef683ea99fe62f1 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sun, 5 Nov 2017 13:51:56 +0100 Subject: Update Functest to OpenStack stable/pike MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- docker/smoke/Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'docker/smoke/Dockerfile') diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 7e12fa8b..ae56a6c7 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -1,17 +1,16 @@ 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 RUN apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev git && \ 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) && \ -- cgit 1.2.3-korg