diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2022-03-04 13:08:15 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2022-03-04 13:08:15 +0100 |
| commit | 57d0741942c23ab66d38b7269e68694b92de9646 (patch) | |
| tree | 11bfa91e4ddcd418ab11733f60cbc4cc703a8789 /docker | |
| parent | bdc882d05a70ec60fa6a4c9f8122ec29cae3f407 (diff) | |
Leverage Xtesting 0.96
Change-Id: I6235342d4d53a688b960698b30332824cd372551
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/benchmarking/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/cnf/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/healthcheck/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/security/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index 3dc88c2e..4bc06efc 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -16,5 +16,5 @@ RUN apk --no-cache add --update py3-matplotlib && \ mv plotperf.py plotperf && chmod a+x plotperf) && \ rm -rf perf-tests /tmp/plotperf.py.patch && \ apk del .build-deps -COPY testcases.yaml /usr/lib/python3.9/site-packages/xtesting/ci/testcases.yaml +COPY testcases.yaml /etc/xtesting/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile index 6774e805..7e6c38f9 100644 --- a/docker/cnf/Dockerfile +++ b/docker/cnf/Dockerfile @@ -27,5 +27,5 @@ RUN apk --no-cache add --update wget curl libc6-compat ncurses && \ ln -s /src/cnf-testsuite/example-cnfs/coredns/cnf-testsuite.yml /src/cnf-testsuite/cnf-testsuite.yml && \ ln -s /src/cnf-testsuite/points-all.yml /src/cnf-testsuite/points.yml && \ rm -rf /src/cnf-testsuite-$CNF_TESTSUITE_TAG.tar.gz /src/cnf-testsuite/.git ;; esac -COPY testcases.yaml /usr/lib/python3.9/site-packages/xtesting/ci/testcases.yaml +COPY testcases.yaml /etc/xtesting/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 6027f570..600119a4 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -45,6 +45,6 @@ RUN apk -U upgrade && \ mkdir -p /var/lib/rally/database && rally db create && \ rm -r /src/requirements/.git /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch && \ apk del .build-deps -COPY logging.ini /usr/lib/python3.9/site-packages/xtesting/ci/logging.ini -COPY logging.debug.ini /usr/lib/python3.9/site-packages/xtesting/ci/logging.debug.ini +COPY logging.ini /etc/xtesting/logging.ini +COPY logging.debug.ini /etc/xtesting/logging.debug.ini CMD ["run_tests", "-t", "all"] diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index dc39ca0c..0100d706 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -11,5 +11,5 @@ RUN apk --no-cache add --update curl libc6-compat && \ mv /src/kubernetes/test/bin/e2e.test /src/kubernetes/test/bin/ginkgo /usr/local/bin/ && \ chmod +x /usr/local/bin/kubectl /usr/local/bin/e2e.test /usr/local/bin/ginkgo && \ rm -r /src/kubernetes /src/kubernetes-test-linux-$arch.tar.gz -COPY testcases.yaml /usr/lib/python3.9/site-packages/xtesting/ci/testcases.yaml +COPY testcases.yaml /etc/xtesting/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/docker/security/Dockerfile b/docker/security/Dockerfile index d3434366..5ecdc9bd 100644 --- a/docker/security/Dockerfile +++ b/docker/security/Dockerfile @@ -1,3 +1,3 @@ FROM opnfv/functest-kubernetes-core -COPY testcases.yaml /usr/lib/python3.9/site-packages/xtesting/ci/testcases.yaml +COPY testcases.yaml /etc/xtesting/testcases.yaml diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index d410efb3..1ae498dc 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -1,4 +1,4 @@ FROM opnfv/functest-kubernetes-healthcheck -COPY testcases.yaml /usr/lib/python3.9/site-packages/xtesting/ci/testcases.yaml +COPY testcases.yaml /etc/xtesting/testcases.yaml CMD ["run_tests", "-t", "all"] |