Updated the code for MOSK 23.3 and OS Antelope
* Base the toolset images on heat:antelope-* image
* Toolset images docker file: intall fio with apt
* Use 0.6.1, 0.6.2 Cirros images instead of 0.5.x
Related-PROD: PROD-37187
Change-Id: I9846fea49f3d65baa50d6afe80210f7443e66aec
diff --git a/k8s/docker-mos-toolset-full b/k8s/docker-mos-toolset-full
index 9df8c2d..011e5e6 100644
--- a/k8s/docker-mos-toolset-full
+++ b/k8s/docker-mos-toolset-full
@@ -1,4 +1,4 @@
-FROM mirantis.azurecr.io/openstack/heat:yoga-focal-20230821170130
+FROM mirantis.azurecr.io/openstack/heat:antelope-jammy-20231204144213
LABEL maintainer="qa-ps@mirantis.com"
@@ -6,13 +6,7 @@
ADD ./src/mos-checker.tgz /opt/cfg-checker/
WORKDIR /opt
RUN apt-get update && \
- apt-get install -y make gcc g++ git libaio-dev libaio1 zlib1g-dev && \
- git clone --depth 1 --branch fio-3.26 https://github.com/axboe/fio.git && \
- cd /opt/fio && \
- ./configure && \
- make && \
- make install && \
- rm -rf /opt/fio && \
+ apt-get install -y make gcc g++ git libaio-dev libaio1 zlib1g-dev fio && \
mkdir /opt/density && \
rm -rf /var/lib/apt/lists/*
@@ -32,7 +26,7 @@
RUN pip3 install --no-cache-dir pyghmi tempestparser
-RUN git clone https://gerrit.mcp.mirantis.com/mcp/cvp-configuration -b 23.2-yoga /opt/res-files && \
+RUN git clone https://gerrit.mcp.mirantis.com/mcp/cvp-configuration -b 23.3-antelope /opt/res-files && \
cd /opt/cfg-checker && \
python3 -m venv .checkervenv && \
. .checkervenv/bin/activate && \
@@ -50,7 +44,6 @@
python3 -m venv .sivenv && \
. .sivenv/bin/activate && \
pip3 install --no-cache-dir -r si_tests/requirements.txt && \
- pip3 install urllib3==1.26.16 && \
deactivate
RUN mkdir /opt/packages/ && \