diff options
| author |   Jose Lausuch <jalausuch@suse.com> | 2017-11-15 17:11:41 +0100 |
|---|---|---|
| committer | Jose Lausuch <jalausuch@suse.com> | 2017-11-22 19:48:38 +0100 |
| commit | d4996440fa16297aee7a925e6357a9cfd42d24f8 (patch) | |
| tree | e2ef5c7c02eac83422848b7ce186171facf5547c /docker | |
| parent | 185dbcfb6ed774cc2f0478b05041d9e3a4e2f303 (diff) | |
Remove prepare_env
After moving the rally installation out of prepare_env
It doesn't much sense to keep this script as it doesn't
do useful things any more.
Change-Id: I9ab3b2dd30c8ec0fbb825ee4302a83cce80f1cbe
Signed-off-by: Jose Lausuch <jalausuch@suse.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/components/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/features/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/healthcheck/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/parser/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/vnf/Dockerfile | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/docker/components/Dockerfile b/docker/components/Dockerfile index a0f7a48e..ce0d0c50 100644 --- a/docker/components/Dockerfile +++ b/docker/components/Dockerfile @@ -30,4 +30,4 @@ RUN apk --no-cache add --virtual .build-deps --update \ 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"] +CMD ["run_tests", "-t", "all"] diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index 1fb48829..eaf88f89 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -22,4 +22,4 @@ RUN apk --no-cache add --update python3 sshpass && \ rm -r upper-constraints.txt thirdparty-requirements.txt /src/fds/.git && \ 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"] +CMD ["run_tests", "-t", "all"] diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index 8923e4cd..21b46ef9 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -1,4 +1,4 @@ FROM opnfv/functest-core COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml -CMD ["bash","-c","prepare_env start && run_tests -t all"] +CMD ["run_tests", "-t", "all"] diff --git a/docker/parser/Dockerfile b/docker/parser/Dockerfile index 043f214a..bf43ac0c 100644 --- a/docker/parser/Dockerfile +++ b/docker/parser/Dockerfile @@ -18,4 +18,4 @@ RUN apk --no-cache add --virtual .build-deps --update \ rm upper-constraints.txt thirdparty-requirements.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"] +CMD ["run_tests", "-t", "all"] diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 4485699c..f8a42c49 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -39,4 +39,4 @@ RUN apk --no-cache add --virtual .build-deps --update \ 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"] +CMD ["run_tests", "-t", "all"] diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index 36e80d7e..ac3b8dab 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -12,4 +12,4 @@ RUN apk --no-cache add --update \ cd /src/vims-test && bundle config build.nokogiri --use-system-libraries && bundle install --system && \ 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"] +CMD ["run_tests", "-t", "all"] |