From c87d1004da7339738f19ee909bad50e6f9bc9941 Mon Sep 17 00:00:00 2001
From: Markos Chandras <mchandras@suse.de>
Date: Wed, 11 Apr 2018 13:10:43 +0100
Subject: [PATCH 1/1] jjb: xci: xci-run-functest.sh: Reload XCI environment for
 functest

We should reload the XCI environment before running functest in order to
ensure that playbooks have the correct information from the XCI
deployment.

Change-Id: Ieadeca61d3ea3e504e21aa96945ad067f20d1489
Signed-off-by: Markos Chandras <mchandras@suse.de>
---
 jjb/xci/xci-run-functest.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/jjb/xci/xci-run-functest.sh b/jjb/xci/xci-run-functest.sh
index 83acd6062..7fb0be9b9 100755
--- a/jjb/xci/xci-run-functest.sh
+++ b/jjb/xci/xci-run-functest.sh
@@ -44,9 +44,10 @@ if ! sed -n "/^- scenario: $DEPLOY_SCENARIO$/,/^$/p" $OPNFV_SCENARIO_REQUIREMENT
 fi
 
 # set XCI_VENV for ansible
-export XCI_VENV=/home/devuser/releng-xci/venv
+export XCI_PATH=/home/devuser/releng-xci
+export XCI_VENV=${XCI_PATH}/venv
 
-ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm "source $XCI_VENV/bin/activate; cd releng-xci/xci && ansible-playbook -i installer/osa/files/$XCI_FLAVOR/inventory playbooks/prepare-functest.yml"
+ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm "source $XCI_VENV/bin/activate; source ${XCI_PATH}/.cache/xci.env && cd releng-xci/xci && ansible-playbook -i installer/osa/files/$XCI_FLAVOR/inventory playbooks/prepare-functest.yml"
 echo "Running functest"
 ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm_opnfv "/root/run-functest.sh"
 # Record exit code
-- 
2.16.6