From: Markos Chandras <mchandras@suse.de>
Date: Wed, 16 May 2018 13:06:16 +0000 (+0100)
Subject: xci: xci-deploy.sh: Only check for xci_overrides files in scenarios cache
X-Git-Tag: 6.0.0~5^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=c674c1fc281b4b81152a80493bfd8cdb9b91e3db;p=releng-xci.git

xci: xci-deploy.sh: Only check for xci_overrides files in scenarios cache

xci/scenarios has been removed from releng-xci so there is not point in
checking for xci_overrides files there.

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

diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh
index a04fb21e..07f4d39d 100755
--- a/xci/xci-deploy.sh
+++ b/xci/xci-deploy.sh
@@ -164,8 +164,8 @@ echo "-------------------------------------------------------------------------"
 
 # Get scenario variables overrides
 #-------------------------------------------------------------------------------
-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 || :
+source $(find $XCI_SCENARIOS_CACHE/${DEPLOY_SCENARIO} -name xci_overrides) &>/dev/null &&
+    echo "Sourced ${DEPLOY_SCENARIO} overrides files successfully!" || :
 
 #-------------------------------------------------------------------------------
 # Log info to console