display the correct deploy scenario for the functest run

Change-Id: I0b8a6d9409d95033839bdc5b3fbe9d1cbbdf4b7c
Signed-off-by: Periyasamy Palanisamy <periyasamy.palanisamy@ericsson.com>

diff --git a/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 b/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2
index db3daa5..a0ac997 100644 (file)
--- a/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2
+++ b/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Variables that we need to pass from XCI to functest
-XCI_ENV=(INSTALLER_TYPE DEPLOY_SCENARIO XCI_FLAVOR OPENSTACK_OSA_VERSION)
+XCI_ENV=(INSTALLER_TYPE XCI_FLAVOR)
 
 source /root/openrc
 
@@ -22,6 +22,14 @@ if [[ -e /root/xci.env ]]; then
     for x in ${XCI_ENV[@]}; do
         grep "^${x}=" /root/xci.env >> /root/env
     done
+    # Parse the XCI's DEPLOY_SCENARIO and XCI_FLAVOR variables and
+    # set the functest container's DEPLOY_SCENARIO variable in the
+    # following format <scenario>-<flavor>. But the XCI's mini flavor
+    # is converted into noha.
+    DEPLOY_SCENARIO=`grep -Po '(?<=DEPLOY_SCENARIO=).*' /root/xci.env`
+    XCI_FLAVOR=`grep -Po '(?<=XCI_FLAVOR=).*' /root/xci.env`
+    XCI_FLAVOR=${XCI_FLAVOR/mini/noha}
+    echo "DEPLOY_SCENARIO=$DEPLOY_SCENARIO-$XCI_FLAVOR" >> /root/env
 fi
 
 # Dump the env file