diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-12-07 01:31:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-07 01:31:26 +0100 |
| commit | 29dfc63cbf7a8e58f03cc60c7e5b6b762f5be8bb (patch) | |
| tree | 93831b0980fa4bd9bc8be03c10ce3cbb6bed3d58 /tests | |
| parent | Merge pull request #3436 from opensourcerouting/bugfix/topotest-sbin-dir (diff) | |
| parent | tests/topotests: Use copied tests in Docker (diff) | |
| download | frr-29dfc63cbf7a8e58f03cc60c7e5b6b762f5be8bb.tar.xz frr-29dfc63cbf7a8e58f03cc60c7e5b6b762f5be8bb.zip | |
Merge pull request #3437 from opensourcerouting/bugfix/topotests-use-copy
tests/topotests: Use copied tests in Docker
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/topotests/Dockerfile | 1 | ||||
| -rwxr-xr-x | tests/topotests/docker/frr-topotests.sh | 1 | ||||
| -rwxr-xr-x | tests/topotests/docker/inner/entrypoint.sh | 3 |
3 files changed, 2 insertions, 3 deletions
diff --git a/tests/topotests/Dockerfile b/tests/topotests/Dockerfile index 72a876ed8..ea6fa4b9e 100644 --- a/tests/topotests/Dockerfile +++ b/tests/topotests/Dockerfile @@ -72,7 +72,6 @@ RUN echo "" >> /etc/security/limits.conf; \ # Copy run scripts to facilitate users wanting to run the tests COPY docker/inner /opt/topotests -WORKDIR /root/topotests ENV PATH "$PATH:/opt/topotests" RUN echo "cat /opt/topotests/motd.txt" >> /root/.profile && \ diff --git a/tests/topotests/docker/frr-topotests.sh b/tests/topotests/docker/frr-topotests.sh index c13262652..8e93ed31f 100755 --- a/tests/topotests/docker/frr-topotests.sh +++ b/tests/topotests/docker/frr-topotests.sh @@ -135,7 +135,6 @@ fi set -- --rm -i \ -v "$TOPOTEST_LOGS:/tmp" \ -v "$TOPOTEST_FRR:/root/host-frr:ro" \ - -v "$TOPOTEST_FRR/tests/topotests:/root/topotests:ro" \ -v "$TOPOTEST_BUILDCACHE:/root/persist" \ -e "TOPOTEST_CLEAN=$TOPOTEST_CLEAN" \ -e "TOPOTEST_VERBOSE=$TOPOTEST_VERBOSE" \ diff --git a/tests/topotests/docker/inner/entrypoint.sh b/tests/topotests/docker/inner/entrypoint.sh index 3050ec86d..451d0a27d 100755 --- a/tests/topotests/docker/inner/entrypoint.sh +++ b/tests/topotests/docker/inner/entrypoint.sh @@ -34,6 +34,8 @@ set -e "${CDIR}/compile_frr.sh" "${CDIR}/openvswitch.sh" +cd "${FRR_BUILD_DIR}/tests/topotests" + log_info "Setting permissions on /tmp so we can generate logs" chmod 1777 /tmp @@ -42,7 +44,6 @@ if [ $# -eq 0 ] || ([[ "$1" != /* ]] && [[ "$1" != ./* ]]); then export TOPOTESTS_CHECK_STDERR=Yes set -- pytest \ --junitxml /tmp/topotests.xml \ - -o cache_dir=/tmp \ "$@" fi |