From 57970bac489b114ab0483580fef683ea99fe62f1 Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
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 <cedric.ollivier@orange.com>
---
 docker/parser/Dockerfile | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

(limited to 'docker/parser/Dockerfile')

diff --git a/docker/parser/Dockerfile b/docker/parser/Dockerfile
index 6ab0d872c..c98850c28 100644
--- a/docker/parser/Dockerfile
+++ b/docker/parser/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.6
+FROM opnfv/functest-core
 
 ARG BRANCH=master
 ARG OPENSTACK_TAG=stable/pike
@@ -12,31 +12,14 @@ RUN apk --no-cache add --update \
         python-dev build-base linux-headers libffi-dev \
         openssl-dev libjpeg-turbo-dev && \
     wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \
-        sed /^heat-translator=/d | sed /^tosca-parser=/d | \
         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 \
-        -e git+https://github.com/openstack/requirements@$OPENSTACK_TAG#egg=openstack_requirements && \
-    git clone --depth 1 https://github.com/openstack/os-faults.git -b $OS_FAULTS_TAG /src/os-faults && \
-    update-requirements -s --source /src/openstack-requirements /src/os-faults/ && \
-    git clone --depth 1 https://github.com/openstack/rally.git -b $RALLY_TAG /src/rally && \
-    update-requirements -s --source /src/openstack-requirements /src/rally/ && \
-    pip install --no-cache-dir --src /src -cupper-constraints.txt \
-        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-        /src/os-faults /src/rally && \
-    pip install --no-cache-dir --src /src -cupper-constraints.txt \
-        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-        git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \
         git+https://gerrit.opnfv.org/gerrit/parser#egg=nfv-heattranslator\&subdirectory=tosca2heat/heat-translator \
         git+https://gerrit.opnfv.org/gerrit/parser#egg=nfv-toscaparser\&subdirectory=tosca2heat/tosca-parser \
         -e git+https://gerrit.opnfv.org/gerrit/parser#egg=nfv-parser && \
-    rm -r upper-constraints.txt /src/os-faults/.git /src/rally/.git && \
-    mkdir -p /etc/rally && \
-    printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \
-    mkdir -p /var/lib/rally/database && rally-manage db create && \
-    bash -c "mkdir -p /home/opnfv/functest{/conf,/data,/images,/results} /home/opnfv/repos/vnfs" && \
+    rm upper-constraints.txt && \
     apk del .build-deps
 COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml
 CMD ["bash","-c","prepare_env start && run_tests -t all"]
-- 
cgit 1.2.3-korg