summaryrefslogtreecommitdiffstats
path: root/xci
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2018-04-20 10:34:42 +0100
committerMarkos Chandras <mchandras@suse.de>2018-04-20 10:39:41 +0100
commitd412843b8e26afea25e2a1e4bc6d4c48fb748531 (patch)
tree5517ced461c830e8f2130445352a167953ccd9c6 /xci
parenta38d37e113b38181162ecaa12983dc2fd8fede38 (diff)
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>
Diffstat (limited to 'xci')
-rwxr-xr-xxci/xci-deploy.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh
index a8b7adbd..c0c1a8ef 100755
--- 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}'"