Different fixes added/baackported
List of changes:
* fixed path of automated reports to /artifacts/reports/
* fixed toolset full dockerfile
* fixed typo in rally mos dry-run json file
* added copying spt reports
Related-PROD: PROD-37187
Change-Id: Ib4f05f49d3af44a1e63933a6cc0e2f47094bee64
diff --git a/k8s/docker-mos-toolset-full b/k8s/docker-mos-toolset-full
index 9df8c2d..58ae345 100644
--- a/k8s/docker-mos-toolset-full
+++ b/k8s/docker-mos-toolset-full
@@ -2,8 +2,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
RUN apt-get update && \
apt-get install -y make gcc g++ git libaio-dev libaio1 zlib1g-dev && \
@@ -70,7 +70,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 && \
@@ -80,5 +80,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.2-yoga" > /dockerimage_metadata
+
ENTRYPOINT ["sleep infinite"]
diff --git a/k8s/rally-files/openstack-mos-scn-i1.json b/k8s/rally-files/openstack-mos-scn-i1.json
index 74c2ed3..ff7570b 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 = "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-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..df97b05 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/
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