Skip to content

Commit

Permalink
tests: Deprecate TOPOTEST_PULL
Browse files Browse the repository at this point in the history
We do not maintain docker.com/frrouting anymore and not building custom
images for topotests.

Use local images for topotests instead.

Just use:

```
mak topotests-build
make topotests
```

Signed-off-by: Donatas Abraitis <[email protected]>
  • Loading branch information
ton31337 committed Nov 26, 2024
1 parent 6eb3a60 commit f3189d7
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 9 deletions.
2 changes: 1 addition & 1 deletion doc/developer/topotests.rst
Original file line number Diff line number Diff line change
Expand Up @@ -881,7 +881,7 @@ commands:
.. code:: console
make topotests-build
TOPOTEST_PULL=0 make topotests
make topotests
.. _topotests-guidelines:
Expand Down
2 changes: 1 addition & 1 deletion tests/topotests/docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,5 @@ without pulling from the registry using the following commands:

```console
make topotests-build
TOPOTEST_PULL=0 make topotests
make topotests
```
7 changes: 0 additions & 7 deletions tests/topotests/docker/frr-topotests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@ if [[ "$1" = "-h" ]] || [[ "$1" = "--help" ]]; then
TOPOTEST_OPTIONS These options are appended to the docker-run
command for starting the tests.
TOPOTEST_PULL If set to 0, don't try to pull the most recent
version of the docker image from dockerhub.
TOPOTEST_SANITIZER Controls whether to use the address sanitizer.
Enabled by default, set to 0 to disable.
Expand Down Expand Up @@ -122,10 +119,6 @@ if [ -z "$TOPOTEST_BUILDCACHE" ]; then
|| docker volume create "${TOPOTEST_BUILDCACHE}"
fi

if [ "${TOPOTEST_PULL:-1}" = "1" ]; then
docker pull frrouting/topotests:latest
fi

if [[ -n "$TMUX" ]]; then
TMUX_OPTIONS="-v $(dirname $TMUX):$(dirname $TMUX) -e TMUX=$TMUX -e TMUX_PANE=$TMUX_PANE"
fi
Expand Down

0 comments on commit f3189d7

Please sign in to comment.