From: Periyasamy Palanisamy <periyasamy.palanisamy@ericsson.com>
Date: Thu, 25 Jan 2018 16:44:06 +0000 (+0100)
Subject: correct the lookup logic for scenario's xci_overrides
X-Git-Tag: 6.0.0~174^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F33%2F51133%2F2;p=releng-xci.git

correct the lookup logic for scenario's xci_overrides

Previously xci-deploy.sh looks up the xci_overrides files under
$XCI_SCENARIOS_CACHE/${DEPLOY_SCENARIO} directory, but actually
xci_overrides file resides somewhere in the nested directory level
in both inband/outband scenarios. Hence the fix is done by using
the find command.

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

diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh
index c1f14b75..f8980a85 100755
--- a/xci/xci-deploy.sh
+++ b/xci/xci-deploy.sh
@@ -136,9 +136,7 @@ echo "-------------------------------------------------------------------------"
 #-------------------------------------------------------------------------------
 # Get scenario variables overrides
 #-------------------------------------------------------------------------------
-if [[ -f $XCI_SCENARIOS_CACHE/${DEPLOY_SCENARIO:-_no_scenario_}/xci_overrides ]]; then
-    source $XCI_SCENARIOS_CACHE/$DEPLOY_SCENARIO/xci_overrides
-fi
+source $(find $XCI_SCENARIOS_CACHE/${DEPLOY_SCENARIO} -name xci_overrides) &>/dev/null || :
 
 #-------------------------------------------------------------------------------
 # Start provisioning VM nodes