4 files changed, 29 insertions, 9 deletions
diff --git a/xci/playbooks/configure-localhost.yml b/xci/playbooks/configure-localhost.yml
index a5b0e3fa..0e3cde6e 100644
--- a/xci/playbooks/configure-localhost.yml
+++ b/xci/playbooks/configure-localhost.yml
@@ -98,3 +98,8 @@
             - OPENSTACK_OSA_DEV_PATH != ""
       when:
         - INSTALLER_TYPE == "osa"
+
+    - name: Dump XCI execution environment to a file
+      shell: env > "{{ XCI_PATH }}/.cache/xci.env"
+      args:
+        executable: /bin/bash
diff --git a/xci/playbooks/roles/.gitignore b/xci/playbooks/roles/.gitignore
deleted file mode 100644
index 296233e0..00000000
--- a/xci/playbooks/roles/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-*
-!.gitignore
-!clone-repository/
-!bootstrap-host/
-!configure-nfs/
-!prepare-functest/
-!remote-folders/
diff --git a/xci/playbooks/roles/prepare-functest/templates/env.j2 b/xci/playbooks/roles/prepare-functest/templates/env.j2
index 43a581bd..af271ac7 100644
--- a/xci/playbooks/roles/prepare-functest/templates/env.j2
+++ b/xci/playbooks/roles/prepare-functest/templates/env.j2
@@ -1,7 +1,5 @@
-INSTALLER_TYPE=osa
 INSTALLER_IP=192.168.122.2
 EXTERNAL_NETWORK={{ external_network }}
-DEPLOY_SCENARIO="os-nosdn-nofeature-noha"
 CI_LOOP=daily
 TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results
 ENERGY_RECORDER_API_URL=http://energy.opnfv.fr/resources
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  \