Fix rally db issue

Also update "rally-manage db" to "rally db"

Change-Id: I0c9924b9869135d3492dfafe89d085813290f565
Signed-off-by: Linda Wang <wangwulin@huawei.com>

diff --git a/docker/components/Dockerfile b/docker/components/Dockerfile
index 781022e..a0f7a48 100644 (file)
--- a/docker/components/Dockerfile
+++ b/docker/components/Dockerfile
@@ -27,7 +27,7 @@ RUN apk --no-cache add --virtual .build-deps --update \
     rm -r upper-constraints.txt /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-manage db create && \
+    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 ["bash","-c","prepare_env start && run_tests -t all"]

diff --git a/docker/restapi/Dockerfile b/docker/restapi/Dockerfile
index dc0119a..81b79fd 100644 (file)
--- a/docker/restapi/Dockerfile
+++ b/docker/restapi/Dockerfile
@@ -44,10 +44,13 @@ RUN apk --no-cache add --update python3 sshpass \
     git clone --depth 1 -b $FDS_TAG https://gerrit.opnfv.org/gerrit/fds /src/fds && \
     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 && \
+    virtualenv --system-site-packages /src/tempest/.venv --python=python2.7 && \
     (cd /src/vims-test && bundle config build.nokogiri --use-system-libraries && bundle install --system) && \
     rm -r upper-constraints.txt thirdparty-requirements.txt /src/refstack-client/.git /src/odl_test/.git \
         /src/os-faults /src/rally /src/fds/.git /src/vims-test/.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 db create && \
     apk del .build-deps
 EXPOSE 5000
 CMD ["functest_restapi"]

diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 01414f3..4485699 100644 (file)
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -36,7 +36,7 @@ RUN apk --no-cache add --virtual .build-deps --update \
     rm -r upper-constraints.txt /src/refstack-client/.git /src/odl_test/.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-manage db create && \
+    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 ["bash","-c","prepare_env start && run_tests -t all"]