1 files changed, 24 insertions, 0 deletions
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 c0b9bc88..a0ac9970 100644
--- a/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2
+++ b/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Variables that we need to pass from XCI to functest
+XCI_ENV=(INSTALLER_TYPE XCI_FLAVOR)
+
 source /root/openrc
 
 openstack --insecure network create --external \
@@ -14,6 +17,27 @@ openstack --insecure subnet create --network {{ external_network }} \
 mkdir ~/results/
 mkdir ~/images && cd ~/images && wget -q http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img && cd ~
 
+# Extract variables from xci.env file
+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
+echo "------------------------------------------------------"
+echo "------------- functest environment file --------------"
+cat /root/env
+echo "------------------------------------------------------"
+
 sudo docker run --env-file env \
     -v $(pwd)/openrc:/home/opnfv/functest/conf/env_file  \
     -v $(pwd)/images:/home/opnfv/functest/images  \