summaryrefslogtreecommitdiffstats
path: root/xci/config
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2017-12-12 14:58:50 +0000
committerMarkos Chandras <mchandras@suse.de>2017-12-13 20:30:51 +0000
commit151d8e21a5f146418e9f28d91c6e93edbac367ea (patch)
treebdd36deace7d468a426d29c22644426fbe845236 /xci/config
parent304a45bbdc52aa5e7f4374d027e4e17f42d2cd75 (diff)
xci: Fix checkout location for OpenStack-Ansible
The OPENSTACK_OSA_PATH only makes sense on localhost. As such, when we use it on playbooks that operate on remote hosts, the result is not predictable. However, we rsync the entire releng-xci repository to the opfnv host so we can make everything predictable by simply clone everything in advance in the .cache directory. That directory is then rsync'd to the opnfv host. As such, we can repurpose the OPENSTACK_OSA_PATH to point to the path into the OPNFV host. Moreover, all external repositories are being cloned to .cache/repos so we can eliminate some variables in order to simplify the code. Finally, we bring back the ability to use an external OSA repository for development purposes. Change-Id: Ieef3e22ae2085f6735185634d555cfc0d4b69b39 Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'xci/config')
-rwxr-xr-xxci/config/env-vars8
1 files changed, 5 insertions, 3 deletions
diff --git a/xci/config/env-vars b/xci/config/env-vars
index 67ce443e..3777bec0 100755
--- a/xci/config/env-vars
+++ b/xci/config/env-vars
@@ -11,15 +11,17 @@ export OPNFV_HOST_IP=192.168.122.2
export XCI_FLAVOR_ANSIBLE_FILE_PATH=$XCI_PATH/xci/file/$XCI_FLAVOR
export CI_LOOP=${CI_LOOP:-daily}
export JOB_NAME=${JOB_NAME:-false}
+# XCI_CACHE is a cache on localhost where repositories and scenarios are cloned.
export XCI_CACHE=${XCI_PATH}/.cache
+# OPNFV_XCI_CACHE is similar to XCI_CACHE but refers to the remote OPNFV host.
+export OPNFV_XCI_CACHE="/root/releng-xci/.cache"
export XCI_SCENARIOS_CACHE="${XCI_CACHE}/repos/scenarios"
export XCI_PLAYBOOKS=${XCI_PATH}/xci/playbooks
#-------------------------------------------------------------------------------
-# Paths where git repositories of XCI Components will be cloned
+# Paths where git repositories of XCI Components will be cloned on the OPNFV host
#-------------------------------------------------------------------------------
-export OPENSTACK_BIFROST_PATH="${XCI_CACHE}/repos/bifrost"
-export OPENSTACK_OSA_PATH="${XCI_CACHE}/repos/openstack-ansible"
+export OPENSTACK_OSA_PATH="${OPNFV_XCI_CACHE}/repos/openstack-ansible"
# Logging
export LOG_PATH=${LOG_PATH:-${XCI_PATH}/xci/logs}