correct the lookup logic for scenario's xci_overrides 33/51133/2
authorPeriyasamy Palanisamy <periyasamy.palanisamy@ericsson.com>
Thu, 25 Jan 2018 16:44:06 +0000 (17:44 +0100)
committerPeriyasamy Palanisamy <periyasamy.palanisamy@ericsson.com>
Fri, 26 Jan 2018 09:44:00 +0000 (10:44 +0100)
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>
xci/xci-deploy.sh

index c1f14b7..f8980a8 100755 (executable)
@@ -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