From c2de083b7a7c746cb49228f02b0e11d7b2419126 Mon Sep 17 00:00:00 2001 From: Periyasamy Palanisamy Date: Thu, 25 Jan 2018 17:44:06 +0100 Subject: 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 --- xci/xci-deploy.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 -- cgit 1.2.3-korg