Prepared fixed for the MOS Victoria-based image, MOS 23.2
The list of the fixes / improvements:
* Dockerfiles: set the FROM image to the Mirantis heat
Victoria image of MOS 23.2. Fixed some packages installation.
* Python cleanup.py script: re-wrote opertions with the
volume groups and volume group types with the specific
API version, resettings volume status, finding the
server groups. Added the functions for non-existing
methods in downstream openstacksdk.
* FIO scripts: Fixed the attaching/detaching the volumes,
some other fixes.
* Refreshed the si-tests, mos-spt, cfg-checker repositories,
archived.
* Changed the tag of the toolset image for Victoria:
toolset:23.2-victoria
Change-Id: I762eaa813c4c864979a2dfb5151dd082aff98cb2
diff --git a/k8s/docker-mos-rally b/k8s/docker-mos-rally
index 7d1b5d6..c2d5406 100644
--- a/k8s/docker-mos-rally
+++ b/k8s/docker-mos-rally
@@ -1,6 +1,6 @@
FROM xrally/xrally-openstack:2.1.0
-MAINTAINER Alex Savatieiev (a.savex@gmail.com)
+LABEL maintainer="qa-ps@mirantis.com"
WORKDIR /rally
RUN mkdir /rally/rally-files && \
diff --git a/k8s/docker-mos-toolset-full b/k8s/docker-mos-toolset-full
index 0ce01e3..729a3d1 100644
--- a/k8s/docker-mos-toolset-full
+++ b/k8s/docker-mos-toolset-full
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM mirantis.azurecr.io/openstack/heat:victoria-focal-20230912131036
LABEL maintainer="qa-ps@mirantis.com"
@@ -30,9 +30,9 @@
apt-get install -y helm && \
rm -rf /var/lib/apt/lists/*
-RUN pip3 install --no-cache-dir python-openstackclient python-neutronclient python-heatclient pyghmi python-octaviaclient tempestparser python-ironicclient aodhclient gnocchiclient python-barbicanclient python-glanceclient
+RUN pip3 install --no-cache-dir pyghmi tempestparser
-RUN git clone https://gerrit.mcp.mirantis.com/mcp/cvp-configuration /opt/res-files && \
+RUN git clone https://gerrit.mcp.mirantis.com/mcp/cvp-configuration -b 23.2-victoria /opt/res-files && \
cd /opt/cfg-checker && \
python3 -m venv .checkervenv && \
. .checkervenv/bin/activate && \
@@ -50,6 +50,7 @@
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/ && \
diff --git a/k8s/docker-mos-toolset-min b/k8s/docker-mos-toolset-min
index 53e6c55..f1350c2 100644
--- a/k8s/docker-mos-toolset-min
+++ b/k8s/docker-mos-toolset-min
@@ -1,6 +1,6 @@
-FROM ubuntu:20.04
+FROM mirantis.azurecr.io/openstack/heat:victoria-focal-20230912131036
-MAINTAINER Alex Savatieiev (a.savex@gmail.com)
+LABEL maintainer="qa-ps@mirantis.com"
ADD ./src/mos-spt.tgz /opt/mos-spt/
WORKDIR /opt
@@ -20,7 +20,7 @@
apt autoremove --yes && \
rm -rf /var/lib/apt/lists/*
-RUN pip3 install --no-cache-dir python-openstackclient python-neutronclient python-heatclient pyghmi python-octaviaclient tempestparser python-ironicclient aodhclient gnocchiclient python-barbicanclient python-glanceclient
+RUN pip3 install --no-cache-dir tempestparser
RUN mkdir /opt/packages/ && \
cd /opt/packages && \
diff --git a/k8s/docker-rally-2.1.0 b/k8s/docker-rally-2.1.0
index c0996d1..510638d 100644
--- a/k8s/docker-rally-2.1.0
+++ b/k8s/docker-rally-2.1.0
@@ -1,6 +1,6 @@
FROM xrally/xrally-openstack:2.1.0
-MAINTAINER Alex Savatieiev (a.savex@gmail.com)
+LABEL maintainer="qa-ps@mirantis.com"
WORKDIR /rally
RUN sudo apt update && \
diff --git a/k8s/src/mos-checker.tgz b/k8s/src/mos-checker.tgz
index 9c7949a..543da28 100644
--- a/k8s/src/mos-checker.tgz
+++ b/k8s/src/mos-checker.tgz
Binary files differ
diff --git a/k8s/src/mos-spt.tgz b/k8s/src/mos-spt.tgz
index 978a9e6..be7571d 100644
--- a/k8s/src/mos-spt.tgz
+++ b/k8s/src/mos-spt.tgz
Binary files differ
diff --git a/k8s/src/si-tests.tgz b/k8s/src/si-tests.tgz
index c5f69a7..a55d434 100644
--- a/k8s/src/si-tests.tgz
+++ b/k8s/src/si-tests.tgz
Binary files differ
diff --git a/k8s/yamls/qa-toolset-bare.yaml b/k8s/yamls/qa-toolset-bare.yaml
index 2a41b98..cb8bae9 100644
--- a/k8s/yamls/qa-toolset-bare.yaml
+++ b/k8s/yamls/qa-toolset-bare.yaml
@@ -10,8 +10,8 @@
- infinity
imagePullPolicy: IfNotPresent
name: toolset
- #image: savex13/toolset:latest
- image: registry.mirantis.com/osavatieiev/toolset:latest
+ #image: registry.mirantis.com/professional-services-qa/toolset:latest
+ image: registry.mirantis.com/professional-services-qa/toolset:23.2-victoria
dnsPolicy: ClusterFirst
volumes:
- emptyDir: {}
diff --git a/k8s/yamls/qa-toolset.yaml b/k8s/yamls/qa-toolset.yaml
index 8487ac1..5f64332 100644
--- a/k8s/yamls/qa-toolset.yaml
+++ b/k8s/yamls/qa-toolset.yaml
@@ -67,7 +67,8 @@
name: toolset
#image: 127.0.0.1:44301/general/external/docker.io/library/ubuntu:bionic-20201119
#image: savex13/toolset:latest
- image: registry.mirantis.com/osavatieiev/toolset:latest
+ #image: registry.mirantis.com/osavatieiev/toolset:latest
+ image: registry.mirantis.com/osavatieiev/toolset:23.2-victoria
volumeMounts:
- mountPath: /artifacts
name: qa-pv-a