Added installation of 'iperf' package to the offline images and pods
Added installation of 'iperf' package to the offline images due to
the fix in mos-spt (https://gerrit.mcp.mirantis.com/c/mcp/mos-spt/+/138830):
using iperf (v2) tool for the multiple threads test cases.
Related-PROD: PROD-36943
Change-Id: I157da5f37678b54cacdcdb38b3ea45aba347bd0a
diff --git a/k8s/docker-mos-toolset-full b/k8s/docker-mos-toolset-full
index 5876ad3..b621299 100644
--- a/k8s/docker-mos-toolset-full
+++ b/k8s/docker-mos-toolset-full
@@ -16,7 +16,7 @@
RUN export TZ="America/Chicago" && \
ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && \
- apt-get install -y python3-pip python3-venv vim git iperf3 mtr htop iputils-ping traceroute tcpdump wget iproute2 curl screen qemu-utils
+ apt-get install -y python3-pip python3-venv vim git iperf3 iperf mtr htop iputils-ping traceroute tcpdump wget iproute2 curl screen qemu-utils
RUN curl https://baltocdn.com/helm/signing.asc | apt-key add - && \
apt-get install apt-transport-https --yes && \
@@ -50,7 +50,7 @@
RUN mkdir /opt/packages/ && \
cd /opt/packages && \
- apt-get download $(apt-cache depends --recurse --no-recommends --no-suggests --no-conflicts --no-breaks --no-replaces --no-enhances iperf3 fio | grep "^\w" | sort -u) || true
+ apt-get download $(apt-cache depends --recurse --no-recommends --no-suggests --no-conflicts --no-breaks --no-replaces --no-enhances iperf3 iperf fio | grep "^\w" | sort -u) || true
RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" && \
install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl && \
diff --git a/k8s/docker-mos-toolset-min b/k8s/docker-mos-toolset-min
index a95b7bf..032a3a0 100644
--- a/k8s/docker-mos-toolset-min
+++ b/k8s/docker-mos-toolset-min
@@ -7,7 +7,7 @@
ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && \
apt-get update && \
apt-get install -y make gcc g++ git libaio-dev libaio1 zlib1g-dev && \
- apt-get install -y python3-pip python3-venv vim iperf3 mtr htop iputils-ping traceroute tcpdump wget iproute2 curl screen && \
+ apt-get install -y python3-pip python3-venv vim iperf3 iperf mtr htop iputils-ping traceroute tcpdump wget iproute2 curl screen && \
git clone --depth 1 --branch fio-3.26 https://github.com/axboe/fio.git && \
cd /opt/fio && \
./configure && \
@@ -23,7 +23,7 @@
RUN mkdir /opt/packages/ && \
cd /opt/packages && \
- apt-get download $(apt-cache depends --recurse --no-recommends --no-suggests --no-conflicts --no-breaks --no-replaces --no-enhances iperf3 | grep "^\w" | sort -u) || true
+ apt-get download $(apt-cache depends --recurse --no-recommends --no-suggests --no-conflicts --no-breaks --no-replaces --no-enhances iperf3 iperf | grep "^\w" | sort -u) || true
RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" && \
install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl && \
diff --git a/k8s/init-ubuntu.sh b/k8s/init-ubuntu.sh
index cc9abc2..b140fb8 100644
--- a/k8s/init-ubuntu.sh
+++ b/k8s/init-ubuntu.sh
@@ -4,7 +4,7 @@
apt -y update
export TZ="America/Chicago"
ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-apt -y install python3-pip vim git iperf3 mtr htop iputils-ping traceroute tcpdump wget iproute2 curl
+apt -y install python3-pip vim git iperf3 iperf mtr htop iputils-ping traceroute tcpdump wget iproute2 curl
pip3 install python-openstackclient python-neutronclient python-heatclient pyghmi python-octaviaclient
mkdir /artifacts/cmp-check && cd /artifacts/cmp-check