Different fixes added/backported
List of changes:
* fixed path of automated reports to /artifacts/reports/
* fixed toolset full and min dockerfiles
* fixed typo in rally mos dry-run json
* added copying spt reports
Related-PROD: PROD-37187
Change-Id: I80d9eaa359aa9bb60c3a4a8c51f0d2494e4d36d4
diff --git a/k8s/docker-mos-toolset-full b/k8s/docker-mos-toolset-full
index f279d8f..e9ca1ea 100644
--- a/k8s/docker-mos-toolset-full
+++ b/k8s/docker-mos-toolset-full
@@ -8,8 +8,8 @@
LABEL maintainer="qa-ps@mirantis.com"
-ADD ./src/si-tests.tgz /opt/si-tests/
-ADD ./src/mos-checker.tgz /opt/cfg-checker/
+ADD k8s/src/si-tests.tgz /opt/si-tests/
+ADD k8s/src/mos-checker.tgz /opt/cfg-checker/
WORKDIR /opt
COPY --from=download-packages /opt/packages /opt/packages
@@ -66,7 +66,7 @@
pip3 install --no-cache-dir -r requirements.txt && \
deactivate
-ADD ./src/openstack-refapp.tgz /opt/density/openstack-refapp/
+ADD k8s/src/openstack-refapp.tgz /opt/density/openstack-refapp/
RUN cd /opt/density/openstack-refapp/ && \
python3 -m venv .refapp-venv && \
@@ -76,5 +76,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: 23.3-antelope" > /dockerimage_metadata
+
ENTRYPOINT ["sleep infinite"]
diff --git a/k8s/docker-mos-toolset-min b/k8s/docker-mos-toolset-min
index 24f9f5d..5425ddc 100644
--- a/k8s/docker-mos-toolset-min
+++ b/k8s/docker-mos-toolset-min
@@ -4,14 +4,11 @@
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 && \
rm -rf /var/lib/apt/lists/*
-<<<<<<< HEAD (826e6f Do not run tempest run if the custom params are placeholders)
FROM mirantis.azurecr.io/openstack/heat:antelope-jammy-20231204144213
-=======
->>>>>>> CHANGE (814323 Updated the src folder with new repositories archives)
LABEL maintainer="qa-ps@mirantis.com"
-ADD ./src/mos-spt.tgz /opt/mos-spt/
+ADD k8s/src/mos-spt.tgz /opt/mos-spt/
WORKDIR /opt
COPY --from=download-packages /opt/packages /opt/packages
@@ -23,16 +20,7 @@
apt-get install -y python3-pip python3-venv vim iperf3 iperf mtr htop iputils-ping traceroute tcpdump wget iproute2 curl screen qemu-utils jq && \
rm -rf /var/lib/apt/lists/*
-<<<<<<< HEAD (826e6f Do not run tempest run if the custom params are placeholders)
RUN pip3 install --no-cache-dir tempestparser
-=======
-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 mkdir /opt/packages/ && \
- cd /opt/packages && \
- apt-get update && \
- 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
->>>>>>> CHANGE (814323 Updated the src folder with new repositories archives)
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/rally-files/openstack-mos-scn-i1.json b/k8s/rally-files/openstack-mos-scn-i1.json
index 05f6847..ef64ec9 100644
--- a/k8s/rally-files/openstack-mos-scn-i1.json
+++ b/k8s/rally-files/openstack-mos-scn-i1.json
@@ -8,7 +8,7 @@
{% set tenants = 1 %}
{% set rbd_image = "https://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" %}
{% set heat_template = "/rally/rally-files/default.yaml.template" %}
-{% set fixed_net = "id" %}
+{% set fixed_net = "fixed-net-id" %}
{
"KeystoneBasic.authenticate_user_and_validate_token": [
diff --git a/k8s/workspace/run-networks-mcc.sh b/k8s/workspace/run-networks-mcc.sh
index e54a66f..5684078 100644
--- a/k8s/workspace/run-networks-mcc.sh
+++ b/k8s/workspace/run-networks-mcc.sh
@@ -4,7 +4,7 @@
. /opt/cfg-checker/.checkervenv/bin/activate
mos-checker --env-name $MY_CLIENTSHORTNAME-mcc --env-config /artifacts/envs/mcc-checker.env --kube-config /artifacts/envs/mcc-kubeconfig.yaml network check
-mos-checker --env-name $MY_CLIENTSHORTNAME-mcc --env-config /artifacts/envs/mcc-checker.env --kube-config /artifacts/envs/mcc-kubeconfig.yaml network report --html $MY_CLIENTSHORTNAME-mcc-networks-01.html
+mos-checker --env-name $MY_CLIENTSHORTNAME-mcc --env-config /artifacts/envs/mcc-checker.env --kube-config /artifacts/envs/mcc-kubeconfig.yaml network report --html /artifacts/reports/$MY_CLIENTSHORTNAME-mcc-networks-01.html
deactivate
diff --git a/k8s/workspace/run-networks-mos.sh b/k8s/workspace/run-networks-mos.sh
index 6f712b4..8355768 100644
--- a/k8s/workspace/run-networks-mos.sh
+++ b/k8s/workspace/run-networks-mos.sh
@@ -4,6 +4,6 @@
. /opt/cfg-checker/.checkervenv/bin/activate
mos-checker --env-name $MY_CLIENTSHORTNAME-mos --env-config /artifacts/envs/mos-checker.env --kube-config /artifacts/envs/mos-kubeconfig.yaml network check
-mos-checker --env-name $MY_CLIENTSHORTNAME-mos --env-config /artifacts/envs/mos-checker.env --kube-config /artifacts/envs/mos-kubeconfig.yaml network report --html $MY_CLIENTSHORTNAME-mos-networks-01.html
+mos-checker --env-name $MY_CLIENTSHORTNAME-mos --env-config /artifacts/envs/mos-checker.env --kube-config /artifacts/envs/mos-kubeconfig.yaml network report --html /artifacts/reports/$MY_CLIENTSHORTNAME-mos-networks-01.html
deactivate
diff --git a/k8s/workspace/run-openstack-spt.sh b/k8s/workspace/run-openstack-spt.sh
index 13287aa..13a0e2b 100644
--- a/k8s/workspace/run-openstack-spt.sh
+++ b/k8s/workspace/run-openstack-spt.sh
@@ -25,3 +25,8 @@
echo "# Public network not set: TEMPEST_CUSTOM_PUBLIC_NET=${TEMPEST_CUSTOM_PUBLIC_NET}"
exit 1
fi
+
+echo "# Copying SPT HTML test report"
+mkdir -p /artifacts/reports/mos-spt
+kubectl exec toolset --stdin --tty -n qa-space -- bash -c "mkdir -p /opt/mos-spt/html_reports && cp /opt/mos-spt/*.html /opt/mos-spt/html_reports"
+kubectl cp qa-space/toolset:/opt/mos-spt/html_reports/ /artifacts/reports/mos-spt/
\ No newline at end of file
diff --git a/k8s/workspace/run-packages-mcc.sh b/k8s/workspace/run-packages-mcc.sh
index 1f332c6..179d161 100644
--- a/k8s/workspace/run-packages-mcc.sh
+++ b/k8s/workspace/run-packages-mcc.sh
@@ -2,5 +2,5 @@
cd /artifacts
. env.sh
. /opt/cfg-checker/.checkervenv/bin/activate
-mos-checker --ssh-direct --kube-config /artifacts/envs/mcc-kubeconfig.yaml --env-name $MY_CLIENTSHORTNAME-mcc --env-config /artifacts/envs/mcc-checker.env packages report --html $MY_CLIENTSHORTNAME-mcc-packages-01.html
+mos-checker --ssh-direct --kube-config /artifacts/envs/mcc-kubeconfig.yaml --env-name $MY_CLIENTSHORTNAME-mcc --env-config /artifacts/envs/mcc-checker.env packages report --html /artifacts/reports/$MY_CLIENTSHORTNAME-mcc-packages-01.html
deactivate
diff --git a/k8s/workspace/run-packages-mos.sh b/k8s/workspace/run-packages-mos.sh
index 88f97bb..2740652 100644
--- a/k8s/workspace/run-packages-mos.sh
+++ b/k8s/workspace/run-packages-mos.sh
@@ -2,5 +2,5 @@
cd /artifacts
. env.sh
. /opt/cfg-checker/.checkervenv/bin/activate
-mos-checker --ssh-direct --kube-config /artifacts/envs/mos-kubeconfig.yaml --env-name $MY_CLIENTSHORTNAME-mos --env-config /artifacts/envs/mos-checker.env packages report --html $MY_CLIENTSHORTNAME-mos-packages-01.html
+mos-checker --ssh-direct --kube-config /artifacts/envs/mos-kubeconfig.yaml --env-name $MY_CLIENTSHORTNAME-mos --env-config /artifacts/envs/mos-checker.env packages report --html /artifacts/reports/$MY_CLIENTSHORTNAME-mos-packages-01.html
deactivate