summaryrefslogtreecommitdiffstats
path: root/docker/ubuntu22-ci
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-27 04:24:34 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-27 04:24:34 +0000
commit137ce8dd46d313f15ee93ddbb5428d702aa61ed8 (patch)
treea49f76849019651842962dff2197b705e33831e7 /docker/ubuntu22-ci
parentReleasing progress-linux version 9.1-0.1~progress7.99u1. (diff)
downloadfrr-137ce8dd46d313f15ee93ddbb5428d702aa61ed8.tar.xz
frr-137ce8dd46d313f15ee93ddbb5428d702aa61ed8.zip
Merging upstream version 10.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'docker/ubuntu22-ci')
-rw-r--r--docker/ubuntu22-ci/README.md14
1 files changed, 7 insertions, 7 deletions
diff --git a/docker/ubuntu22-ci/README.md b/docker/ubuntu22-ci/README.md
index 403abbf..73f4a10 100644
--- a/docker/ubuntu22-ci/README.md
+++ b/docker/ubuntu22-ci/README.md
@@ -11,43 +11,43 @@ docker build -t frr-ubuntu22:latest -f docker/ubuntu-ci/Dockerfile .
# Running Full Topotest
```
-docker run --init -it --privileged --name frr -v /lib/modules:/lib/modules frr-ubuntu22:latest bash -c 'cd ~/frr/tests/topotests ; sudo pytest -nauto --dist=loadfile'
+docker run --init -it --privileged --name frr-ubuntu22 -v /lib/modules:/lib/modules frr-ubuntu22:latest bash -c 'cd ~/frr/tests/topotests ; sudo pytest -nauto --dist=loadfile'
```
# Extract results from the above run into `run-results` dir and analyze
```
-tests/topotest/analyze.py -C frr -Ar run-results
+tests/topotests/analyze.py -C frr-ubuntu22 -Ar run-results
```
# Running
```
-docker run -d --init --privileged --name frr --mount type=bind,source=/lib/modules,target=/lib/modules frr-ubuntu22:latest
+docker run -d --init --privileged --name frr-ubuntu22 --mount type=bind,source=/lib/modules,target=/lib/modules frr-ubuntu22:latest
```
# make check
```
-docker exec frr bash -c 'cd ~/frr ; make check'
+docker exec frr-ubuntu22 bash -c 'cd ~/frr ; make check'
```
# interactive bash
```
-docker exec -it frr bash
+docker exec -it frr-ubuntu22 bash
```
# topotest -- when Host O/S is Ubuntu only
```
-docker exec frr bash -c 'cd ~/frr/tests/topotests/ospf-topo1 ; sudo pytest test_ospf_topo1.py'
+docker exec frr-ubuntu22 bash -c 'cd ~/frr/tests/topotests/ospf_topo1 ; sudo pytest test_ospf_topo1.py'
```
# stop & remove container
```
-docker stop frr ; docker rm frr
+docker stop frr-ubuntu22 ; docker rm frr-ubuntu22
```
# remove image