From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Wed, 31 Jan 2018 17:57:46 +0000 (+0100)
Subject: Add tempest and rally in functest-features
X-Git-Tag: opnfv-6.0.0~210
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=834c2cd75b7af478e7456f9fd7a344b5ccf92665;p=functest.git

Add tempest and rally in functest-features

SDNVPN also requires these packages.
It would be refactored in a second step when xtesting is published.

Change-Id: I069ecf8d60dc0ee1a755d0974913b686f4c7ae61
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index eaf88f89c..13869f1b8 100644
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -3,6 +3,8 @@ FROM opnfv/functest-core
 ARG BRANCH=master
 ARG OPENSTACK_TAG=stable/pike
 ARG FDS_TAG=master
+ARG RALLY_TAG=stable/0.10
+ARG OS_FAULTS_TAG=0.1.16
 
 COPY thirdparty-requirements.txt thirdparty-requirements.txt
 RUN apk --no-cache add --update python3 sshpass && \
@@ -14,12 +16,29 @@ RUN apk --no-cache add --update python3 sshpass && \
         > upper-constraints.txt && \
     pip install --no-cache-dir --src /src -cupper-constraints.txt \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-        -rthirdparty-requirements.txt && \
+        -e git+https://github.com/openstack/requirements@$OPENSTACK_TAG#egg=openstack_requirements && \
+    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 \
+        tempest /src/os-faults && \
+    pip install --no-cache-dir --src /src -cupper-constraints.txt \
+        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
+        /src/rally -rthirdparty-requirements.txt && \
     git clone --depth 1 -b $FDS_TAG https://gerrit.opnfv.org/gerrit/fds /src/fds && \
     python3 -m pip install --no-cache-dir --src /src -cupper-constraints.txt \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
         doctor-tests && \
-    rm -r upper-constraints.txt thirdparty-requirements.txt /src/fds/.git && \
+    rm -r upper-constraints.txt thirdparty-requirements.txt /src/fds/.git \
+        /src/os-faults /src/rally && \
+    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 db create && \
     apk del .build-deps
 COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml
 CMD ["run_tests", "-t", "all"]