Prepared toolset image for MOSK 25.2.x, OS Epoxy
Related-PROD: PROD-37187
Change-Id: I18f0f69c0864e23495939fe418bf0bdff17d5bc9
diff --git a/k8s/docker-mos-toolset-full b/k8s/docker-mos-toolset-full
index 6e17739..cc6cb6d 100644
--- a/k8s/docker-mos-toolset-full
+++ b/k8s/docker-mos-toolset-full
@@ -10,7 +10,7 @@
apt-get download $(apt-cache depends --recurse --no-recommends --no-suggests --no-conflicts --no-breaks --no-replaces --no-enhances iperf3 iperf fio nfs-utils | grep "^\w" | sort -u) || true && \
rm -rf /var/lib/apt/lists/*
-FROM mirantis.azurecr.io/openstack/heat:caracal-jammy-20250314195424
+FROM mirantis.azurecr.io/openstack/heat:epoxy-noble-20251017061956
LABEL maintainer="qa-ps@mirantis.com"
@@ -42,7 +42,7 @@
RUN pip3 install --no-cache-dir pyghmi tempestparser
-RUN git clone https://gerrit.mcp.mirantis.com/mcp/cvp-configuration -b 25.1-caracal /opt/res-files && \
+RUN git clone https://gerrit.mcp.mirantis.com/mcp/cvp-configuration -b 25.2-epoxy /opt/res-files && \
cd /opt/cfg-checker && \
python3 -m venv .checkervenv && \
. .checkervenv/bin/activate && \
@@ -83,7 +83,7 @@
cp /opt/res-files/scripts/prepare-refapp.sh /opt/density/openstack-refapp/ && \
cp /opt/res-files/scripts/run-refapp-density.sh /opt/density/openstack-refapp/
-RUN printf "LABELS:\n IMAGE_TAG: 25.1-caracal" > /dockerimage_metadata
+RUN printf "LABELS:\n IMAGE_TAG: 25.2-epoxy" > /dockerimage_metadata
ENTRYPOINT ["sleep infinite"]
diff --git a/k8s/workspace/init-workspace.sh b/k8s/workspace/init-workspace.sh
index e85b0c3..2f3be55 100644
--- a/k8s/workspace/init-workspace.sh
+++ b/k8s/workspace/init-workspace.sh
@@ -32,6 +32,9 @@
"1.27")
image_tag="1.27.16-4"
;;
+ "1.30")
+ image_tag="1.30.13-1"
+ ;;
esac
echo "$image_tag"
}
diff --git a/k8s/workspace/run-conformance-mcc.sh b/k8s/workspace/run-conformance-mcc.sh
index c49bcb7..3b7f7d5 100644
--- a/k8s/workspace/run-conformance-mcc.sh
+++ b/k8s/workspace/run-conformance-mcc.sh
@@ -30,6 +30,12 @@
export K8S_CONFORMANCE_IMAGE_URL=${MCC_K8S_CONFORMANCE_IMAGE_URL}
fi
+# Cleaning up
+echo "# Cleaning up '/artifacts/tmp/artifacts/'"
+[ -d "/artifacts/tmp/artifacts/" ] && rm -rf "/artifacts/tmp/artifacts/"
+[ -f "/artifacts/tmp/nosetests.xml" ] && rm "/artifacts/tmp/nosetests.xml"
+mkdir "/artifacts/tmp/artifacts/"
+
# Run tests
pytest /opt/si-tests/si_tests/tests/deployment/test_k8s_conformance.py
unset TARGET_CLUSTER
diff --git a/k8s/workspace/run-conformance-mos.sh b/k8s/workspace/run-conformance-mos.sh
index 05e0bcc..be1bfcb 100644
--- a/k8s/workspace/run-conformance-mos.sh
+++ b/k8s/workspace/run-conformance-mos.sh
@@ -29,6 +29,12 @@
export K8S_CONFORMANCE_IMAGE_URL=${MOS_K8S_CONFORMANCE_IMAGE_URL}
fi
+# Cleaning up
+echo "# Cleaning up '/artifacts/tmp/artifacts/'"
+[ -d "/artifacts/tmp/artifacts/" ] && rm -rf "/artifacts/tmp/artifacts/"
+[ -f "/artifacts/tmp/nosetests.xml" ] && rm "/artifacts/tmp/nosetests.xml"
+mkdir "/artifacts/tmp/artifacts/"
+
# Run tests
pytest /opt/si-tests/si_tests/tests/deployment/test_k8s_conformance.py
unset TARGET_CLUSTER
diff --git a/k8s/yamls/qa-rally.yaml b/k8s/yamls/qa-rally.yaml
index 86ec4e4..fc7c1bf 100644
--- a/k8s/yamls/qa-rally.yaml
+++ b/k8s/yamls/qa-rally.yaml
@@ -76,6 +76,8 @@
readOnly: true
subPath: ca_bundle
dnsPolicy: ClusterFirst
+ nodeSelector:
+ openstack-control-plane: enabled
volumes:
- emptyDir: {}
name: pod-tmp
diff --git a/k8s/yamls/qa-toolset-bare.yaml b/k8s/yamls/qa-toolset-bare.yaml
index c46cd31..80d02c8 100644
--- a/k8s/yamls/qa-toolset-bare.yaml
+++ b/k8s/yamls/qa-toolset-bare.yaml
@@ -10,7 +10,7 @@
- infinity
imagePullPolicy: IfNotPresent
name: toolset
- image: registry.mirantis.com/professional-services-qa/toolset:25.1-caracal
+ image: registry.mirantis.com/professional-services-qa/toolset:25.2-epoxy
dnsPolicy: ClusterFirst
volumes:
- emptyDir: {}
diff --git a/k8s/yamls/qa-toolset.yaml b/k8s/yamls/qa-toolset.yaml
index c49385d..9ed537e 100644
--- a/k8s/yamls/qa-toolset.yaml
+++ b/k8s/yamls/qa-toolset.yaml
@@ -67,7 +67,7 @@
value: /etc/ssl/certs/openstack-ca-bundle.pem
imagePullPolicy: IfNotPresent
name: toolset
- image: registry.mirantis.com/professional-services-qa/toolset:25.1-caracal
+ image: registry.mirantis.com/professional-services-qa/toolset:25.2-epoxy
volumeMounts:
- mountPath: /artifacts
name: qa-pv-a
@@ -76,6 +76,8 @@
readOnly: true
subPath: ca_bundle
dnsPolicy: ClusterFirst
+ nodeSelector:
+ openstack-control-plane: enabled
volumes:
- emptyDir: {}
name: pod-tmp