diff options
| author |   Linda Wang <wangwulin@huawei.com> | 2017-11-21 09:14:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-11-21 09:14:20 +0000 |
| commit | e627ff2e267c1c59461571d23b89b21199e49737 (patch) | |
| tree | c0cc2a4c8f2e5e13d20727ede051f7dc3431b4ae /docker | |
| parent | 45ad7723d0e40e7c5475584fc2a5bc0b5ad3ef56 (diff) | |
| parent | c3b39a30e4c9cc5eafbe38c718f8f34721af5ebb (diff) | |
Merge "Fix rally db issue"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/components/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/restapi/Dockerfile | 5 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/docker/components/Dockerfile b/docker/components/Dockerfile index 781022ef..a0f7a48e 100644 --- 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 dc0119a9..81b79fd8 100644 --- 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 01414f3e..4485699c 100644 --- 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"] |