Commit 70719c3b authored by Raphael Defosseux's avatar Raphael Defosseux Committed by Robert Schmidt

fix(test): using older version of iperf2 for lte feMBMS RF-sim test

iperf2 2.0.13, used in Ubuntu 20, does not need a "back channel"; we can
therefore use it in feMBMS (which does a broadcast, without back
channel). Ubuntu 22 comes with 2.1.5, which seems to require a back
channel, or at least, we cannot use it reliably in feMBMS. Hence,
downgrade to older iperf2 version.
Signed-off-by: default avatarRaphael Defosseux <raphael.defosseux@eurecom.fr>
parent 94497435
...@@ -56,7 +56,7 @@ RUN apt-get update && \ ...@@ -56,7 +56,7 @@ RUN apt-get update && \
libconfig9 \ libconfig9 \
openssl \ openssl \
net-tools \ net-tools \
iperf \ wget \
iperf3 \ iperf3 \
iputils-ping \ iputils-ping \
iproute2 \ iproute2 \
...@@ -65,6 +65,13 @@ RUN apt-get update && \ ...@@ -65,6 +65,13 @@ RUN apt-get update && \
python3-six \ python3-six \
python3-requests \ python3-requests \
libusb-1.0-0 && \ libusb-1.0-0 && \
# Installing older version of iperf2 for feMBMS test
wget --quiet http://fr.archive.ubuntu.com/ubuntu/pool/universe/i/iperf/iperf_2.0.13+dfsg1-1build1_amd64.deb && \
dpkg -i iperf_2.0.13+dfsg1-1build1_amd64.deb && \
# iperf --version returns 1 that fails docker build
iperf --version || true && \
rm -f iperf_2.0.13+dfsg1-1build1_amd64.deb && \
apt-get remove -y wget && \
# if the --sanitize option was used to build, additional packages are required # if the --sanitize option was used to build, additional packages are required
/bin/bash -c 'if [[ "$BUILD_OPTION" = "--sanitize" ]]; then DEBIAN_FRONTEND=noninteractive apt-get install --yes \ /bin/bash -c 'if [[ "$BUILD_OPTION" = "--sanitize" ]]; then DEBIAN_FRONTEND=noninteractive apt-get install --yes \
#libasan5 \ # see below #libasan5 \ # see below
......
...@@ -64,7 +64,14 @@ RUN apt-get update && \ ...@@ -64,7 +64,14 @@ RUN apt-get update && \
iputils-ping \ iputils-ping \
iproute2 \ iproute2 \
iperf3 \ iperf3 \
iperf && \ wget && \
# Installing older version of iperf2 for feMBMS test
wget --quiet http://fr.archive.ubuntu.com/ubuntu/pool/universe/i/iperf/iperf_2.0.13+dfsg1-1build1_amd64.deb && \
dpkg -i iperf_2.0.13+dfsg1-1build1_amd64.deb && \
# iperf --version returns 1 that fails docker build
iperf --version || true && \
rm -f iperf_2.0.13+dfsg1-1build1_amd64.deb && \
apt-get remove -y wget && \
# if the --sanitize option was used to build, additional packages are required # if the --sanitize option was used to build, additional packages are required
/bin/bash -c 'if [[ "$BUILD_OPTION" = "--sanitize" ]]; then DEBIAN_FRONTEND=noninteractive apt-get install --yes \ /bin/bash -c 'if [[ "$BUILD_OPTION" = "--sanitize" ]]; then DEBIAN_FRONTEND=noninteractive apt-get install --yes \
#libasan5 \ # see below #libasan5 \ # see below
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment