diff options
| author | Christian Franke <chris@opensourcerouting.org> | 2018-11-29 15:22:23 +0100 |
|---|---|---|
| committer | Christian Franke <chris@opensourcerouting.org> | 2018-11-29 16:51:27 +0100 |
| commit | ff37641ba2e8272ed4f58a88a9f837d5ff9bb560 (patch) | |
| tree | 15287572a84df0f0ebee54191753d3b4d38dbdc3 /tests/topotests/docker | |
| parent | docker/frr-topotests: Fix missing $ in if check (diff) | |
| download | frr-ff37641ba2e8272ed4f58a88a9f837d5ff9bb560.tar.xz frr-ff37641ba2e8272ed4f58a88a9f837d5ff9bb560.zip | |
topotests: Adapt docker changes for integrated tests
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
Diffstat (limited to 'tests/topotests/docker')
| -rwxr-xr-x | tests/topotests/docker/build.sh | 4 | ||||
| -rwxr-xr-x | tests/topotests/docker/frr-topotests.sh | 10 |
2 files changed, 5 insertions, 9 deletions
diff --git a/tests/topotests/docker/build.sh b/tests/topotests/docker/build.sh index 47b14df0b..344fb2ffc 100755 --- a/tests/topotests/docker/build.sh +++ b/tests/topotests/docker/build.sh @@ -22,7 +22,9 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. +cd "$(dirname "$0")"/.. + exec docker build --pull \ --compress \ - -t frrouting/topotests \ + -t frrouting/frr:topotests-latest \ . diff --git a/tests/topotests/docker/frr-topotests.sh b/tests/topotests/docker/frr-topotests.sh index 6ddfdc948..9a157c49a 100755 --- a/tests/topotests/docker/frr-topotests.sh +++ b/tests/topotests/docker/frr-topotests.sh @@ -61,9 +61,6 @@ if [[ "$1" = "-h" ]] || [[ "$1" = "--help" ]]; then TOPOTEST_OPTIONS These options are appended to the docker-run command for starting the tests. - TOPOTEST_PATH If set, don't use the tests built into the image - but the ones at the given path. - TOPOTEST_SANITIZER Controls whether to use the address sanitizer. Enabled by default, set to 0 to disable. @@ -136,6 +133,7 @@ fi set -- --rm -ti \ -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" \ @@ -143,10 +141,6 @@ set -- --rm -ti \ -e "TOPOTEST_SANITIZER=$TOPOTEST_SANITIZER" \ --privileged \ $TOPOTEST_OPTIONS \ - frrouting/topotests "$@" - -if [ -n "$TOPOTEST_PATH" ]; then - set -- -v "$TOPOTEST_PATH:/root/topotests:ro" "$@" -fi + frrouting/frr:topotests-latest "$@" exec docker run "$@" |