aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpmikus <peter.mikus@protonmail.ch>2023-05-30 09:53:54 +0000
committerPeter Mikus <peter.mikus@protonmail.ch>2023-05-30 11:32:31 +0000
commitffb7ab505a7c3005b9542c43ceb95583992b3abf (patch)
treecef7b6fa180bc8ace3fbe23cc56db4f73dcb572c
parentaf1eda41d70a37eeb5a78b0ce48c6a78828ba2f2 (diff)
fix(infra): Add iperf3 dependencies
Signed-off-by: pmikus <peter.mikus@protonmail.ch> Change-Id: Ib79e3d596cb1b83a5859d573b9a87d7bf228f7ac
-rw-r--r--fdio.infra.ansible/roles/docker_images/files/base/Dockerfile2
-rw-r--r--fdio.infra.ansible/roles/docker_images/templates/docker-compose-sut.yaml.j26
-rw-r--r--fdio.infra.ansible/roles/docker_images/templates/docker-compose-tg.yaml.j26
3 files changed, 2 insertions, 12 deletions
diff --git a/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile b/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile
index d69cf98b0b..18cf8b3a3a 100644
--- a/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile
+++ b/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile
@@ -30,6 +30,7 @@ RUN apt-get -q update \
ethtool \
gdb \
gfortran \
+ iperf3 \
libapr1 \
libblas-dev \
libffi-dev \
@@ -57,6 +58,7 @@ RUN apt-get -q update \
python3-virtualenv \
qemu-system \
rsyslog \
+ screen \
socat \
software-properties-common \
strongswan \
diff --git a/fdio.infra.ansible/roles/docker_images/templates/docker-compose-sut.yaml.j2 b/fdio.infra.ansible/roles/docker_images/templates/docker-compose-sut.yaml.j2
index c73cc78c74..be0ffcd9f4 100644
--- a/fdio.infra.ansible/roles/docker_images/templates/docker-compose-sut.yaml.j2
+++ b/fdio.infra.ansible/roles/docker_images/templates/docker-compose-sut.yaml.j2
@@ -32,9 +32,6 @@ services:
source: "/var/run/docker.sock"
target: "/var/run/docker.sock"
- type: "bind"
- source: "/usr/bin/iperf3"
- target: "/usr/bin/iperf3"
- - type: "bind"
source: "/usr/lib/firmware/"
target: "/usr/lib/firmware/"
numa-1:
@@ -69,8 +66,5 @@ services:
source: "/var/run/docker.sock"
target: "/var/run/docker.sock"
- type: "bind"
- source: "/usr/bin/iperf3"
- target: "/usr/bin/iperf3"
- - type: "bind"
source: "/usr/lib/firmware/"
target: "/usr/lib/firmware/" \ No newline at end of file
diff --git a/fdio.infra.ansible/roles/docker_images/templates/docker-compose-tg.yaml.j2 b/fdio.infra.ansible/roles/docker_images/templates/docker-compose-tg.yaml.j2
index f2be329516..6dcbc9f871 100644
--- a/fdio.infra.ansible/roles/docker_images/templates/docker-compose-tg.yaml.j2
+++ b/fdio.infra.ansible/roles/docker_images/templates/docker-compose-tg.yaml.j2
@@ -29,9 +29,6 @@ services:
source: "/opt/"
target: "/opt/"
- type: "bind"
- source: "/usr/bin/iperf3"
- target: "/usr/bin/iperf3"
- - type: "bind"
source: "/usr/lib/firmware/"
target: "/usr/lib/firmware/"
tg-1:
@@ -63,8 +60,5 @@ services:
source: "/opt/"
target: "/opt/"
- type: "bind"
- source: "/usr/bin/iperf3"
- target: "/usr/bin/iperf3"
- - type: "bind"
source: "/usr/lib/firmware/"
target: "/usr/lib/firmware/"