fix(infra): Add iperf3 dependencies

Signed-off-by: pmikus <peter.mikus@protonmail.ch>
Change-Id: Ib79e3d596cb1b83a5859d573b9a87d7bf228f7ac

diff --git a/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile b/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile
index d69cf98..18cf8b3 100644 (file)
--- 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 c73cc78..be0ffcd 100644 (file)
--- 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
@@ -31,9 +31,6 @@ services:
       - type: "bind"
         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/"
@@ -68,9 +65,6 @@ services:
       - type: "bind"
         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 f2be329..6dcbc9f 100644 (file)
--- 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
@@ -28,9 +28,6 @@ services:
       - type: "bind"
         source: "/opt/"
         target: "/opt/"
-      - type: "bind"
-        source: "/usr/bin/iperf3"
-        target: "/usr/bin/iperf3"
       - type: "bind"
         source: "/usr/lib/firmware/"
         target: "/usr/lib/firmware/"
@@ -62,9 +59,6 @@ services:
       - type: "bind"
         source: "/opt/"
         target: "/opt/"
-      - type: "bind"
-        source: "/usr/bin/iperf3"
-        target: "/usr/bin/iperf3"
       - type: "bind"
         source: "/usr/lib/firmware/"
         target: "/usr/lib/firmware/"