diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/components/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 3 | ||||
| -rw-r--r-- | docker/features/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/features/testcases.yaml | 4 | ||||
| -rw-r--r-- | docker/healthcheck/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/parser/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/patrole/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/restapi/Dockerfile | 1 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/vnf/Dockerfile | 2 |
10 files changed, 13 insertions, 9 deletions
diff --git a/docker/components/Dockerfile b/docker/components/Dockerfile index ce0d0c50a..a4561f6af 100644 --- a/docker/components/Dockerfile +++ b/docker/components/Dockerfile @@ -29,5 +29,5 @@ RUN apk --no-cache add --virtual .build-deps --update \ 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 +COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index bc47e39b0..a66993e2a 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -17,5 +17,8 @@ RUN apk --no-cache add --update \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ /src/functest && \ rm -r upper-constraints.txt /src/functest && \ + cp /usr/lib/python2.7/site-packages/functest/ci/logging.ini /usr/lib/python2.7/site-packages/xtesting/ci/ && \ + bash -c "mkdir -p /var/lib/xtesting /home/opnfv" && \ + ln -s /var/lib/xtesting /home/opnfv/functest && \ bash -c "mkdir -p /home/opnfv/functest{/conf,/data,/images,/results} /home/opnfv/repos/vnfs" && \ apk del .build-deps diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index 13869f1b8..1a409b051 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -40,5 +40,5 @@ RUN apk --no-cache add --update python3 sshpass && \ 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 +COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml index 7a30c6d9a..b0ad60ac9 100644 --- a/docker/features/testcases.yaml +++ b/docker/features/testcases.yaml @@ -19,7 +19,7 @@ tiers: installer: 'apex' scenario: '^((?!fdio).)*$' run: - module: 'functest.core.feature' + module: 'xtesting.core.feature' class: 'BashFeature' args: cmd: 'doctor-test' @@ -50,7 +50,7 @@ tiers: installer: '' scenario: 'odl.*sfc' run: - module: 'functest.core.feature' + module: 'xtesting.core.feature' class: 'BashFeature' args: cmd: 'run_sfc_tests.py' diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index 21b46ef97..433f8737d 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 +COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/docker/parser/Dockerfile b/docker/parser/Dockerfile index bf43ac0ce..bbc0a0760 100644 --- a/docker/parser/Dockerfile +++ b/docker/parser/Dockerfile @@ -17,5 +17,5 @@ RUN apk --no-cache add --virtual .build-deps --update \ -rthirdparty-requirements.txt && \ rm upper-constraints.txt thirdparty-requirements.txt && \ apk del .build-deps -COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml +COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/docker/patrole/Dockerfile b/docker/patrole/Dockerfile index c423c403d..6d211e8fe 100644 --- a/docker/patrole/Dockerfile +++ b/docker/patrole/Dockerfile @@ -33,5 +33,5 @@ RUN apk --no-cache add --virtual .build-deps --update \ mkdir -p /var/lib/rally/database && rally db create && \ rm -r upper-constraints.txt /src/os-faults /src/rally && \ apk del .build-deps -COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml +COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/docker/restapi/Dockerfile b/docker/restapi/Dockerfile index a731679ff..2ea8ab906 100644 --- a/docker/restapi/Dockerfile +++ b/docker/restapi/Dockerfile @@ -60,6 +60,7 @@ RUN apk --no-cache add --update python3 sshpass \ mkdir -p /home/opnfv/functest/data/refstack && \ wget "https://refstack.openstack.org/api/v1/guidelines/${REFSTACK_TARGET}/tests?target=compute&type=required&alias=true&flag=false" \ -O /home/opnfv/functest/data/refstack/defcore.txt && \ + cp /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci && \ apk del .build-deps EXPOSE 5000 CMD ["functest_restapi"] diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 00f5bac08..b55b674de 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -44,5 +44,5 @@ RUN apk --no-cache add --virtual .build-deps --update \ wget "https://refstack.openstack.org/api/v1/guidelines/${REFSTACK_TARGET}/tests?target=compute&type=required&alias=true&flag=false" \ -O /home/opnfv/functest/data/refstack/defcore.txt && \ apk del .build-deps -COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml +COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index c52f6bc41..e65c0c484 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -30,5 +30,5 @@ RUN apk --no-cache add --update \ (cd /src/vims-test && bundle config build.nokogiri --use-system-libraries && bundle install --system) && \ rm -r upper-constraints.txt /src/vims-test/.git /src/epc-requirements/abot_charm/.git && \ apk del .build-deps -COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml +COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] |