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/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