diff options
| author | Donatas Abraitis <donatas@opensourcerouting.org> | 2024-11-26 11:42:49 +0200 |
|---|---|---|
| committer | Donatas Abraitis <donatas@opensourcerouting.org> | 2024-11-26 11:42:49 +0200 |
| commit | f3189d797d5edccb7af78d1db0b6d81a2512027c (patch) | |
| tree | f558c7145af28b5c748cc5413e056caf3c93dfe0 | |
| parent | 6eb3a602893d21cc70047f20597adf594d6a45ea (diff) | |
tests: Deprecate TOPOTEST_PULL
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 <donatas@opensourcerouting.org>
| -rw-r--r-- | doc/developer/topotests.rst | 2 | ||||
| -rw-r--r-- | tests/topotests/docker/README.md | 2 | ||||
| -rwxr-xr-x | tests/topotests/docker/frr-topotests.sh | 7 |
3 files changed, 2 insertions, 9 deletions
diff --git a/doc/developer/topotests.rst b/doc/developer/topotests.rst index 5077745a15..9e05a99474 100644 --- a/doc/developer/topotests.rst +++ b/doc/developer/topotests.rst @@ -881,7 +881,7 @@ commands: .. code:: console make topotests-build - TOPOTEST_PULL=0 make topotests + make topotests .. _topotests-guidelines: diff --git a/tests/topotests/docker/README.md b/tests/topotests/docker/README.md index 2b40994cf6..2bd58a15b8 100644 --- a/tests/topotests/docker/README.md +++ b/tests/topotests/docker/README.md @@ -68,5 +68,5 @@ without pulling from the registry using the following commands: ```console make topotests-build -TOPOTEST_PULL=0 make topotests +make topotests ``` diff --git a/tests/topotests/docker/frr-topotests.sh b/tests/topotests/docker/frr-topotests.sh index ce373d9bd0..bd37055147 100755 --- a/tests/topotests/docker/frr-topotests.sh +++ b/tests/topotests/docker/frr-topotests.sh @@ -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. @@ -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 |