xci: xci-deploy: Fix sourcing of inbound scenarios overrides files

We first need to look for the 'xci_overrides' file in the scenarios
directory instead of the the XCI_CACHE since for inbound scenarios
the former contains in-flight changes. The cache only contains whatever
is committed in git and it may not capture changes which are being made
to the actual XCI tree.

Change-Id: Icd64d14d508c89a78823cecf7cc46bd31e50a475
Signed-off-by: Markos Chandras <mchandras@suse.de>

diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh
index a8b7adb..c0c1a8e 100755 (executable)
--- a/xci/xci-deploy.sh
+++ b/xci/xci-deploy.sh
@@ -153,7 +153,8 @@ echo "-------------------------------------------------------------------------"
 #-------------------------------------------------------------------------------
 # Get scenario variables overrides
 #-------------------------------------------------------------------------------
-source $(find $XCI_SCENARIOS_CACHE/${DEPLOY_SCENARIO} -name xci_overrides) &>/dev/null || :
+source $(find $XCI_PATH/xci/scenarios/${DEPLOY_SCENARIO} -name xci_overrides) &>/dev/null || \
+    source $(find $XCI_SCENARIOS_CACHE/${DEPLOY_SCENARIO} -name xci_overrides) &>/dev/null || :
 
 # Deploy infrastructure based on the selected deloyment method
 echo "Info: Deploying hardware using '${INFRA_DEPLOYMENT}'"