From 272820005530af9db4d06510b812f7ad60c17bd0 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Wed, 6 Dec 2017 10:26:53 +0000 Subject: xci: Use local playbooks for XCI deployments Previously, we used to clone the releng-xci repository under a directory in /tmp, copy our changes to that repository and then run the xci-deploy.sh script from it. However, this made things far too complex for deployers and developers since some playbooks were used from the local repo whereas others were used from teh /tmp checkout. By running everything from our local repository simplifies things a lot since we can directly test our changes and also reduces the code we have in our playbooks. Change-Id: If16aa51b2846c170676df82d25cb90e26b1568b2 Signed-off-by: Markos Chandras --- xci/config/env-vars | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'xci/config/env-vars') diff --git a/xci/config/env-vars b/xci/config/env-vars index a7d8696f..67ce443e 100755 --- a/xci/config/env-vars +++ b/xci/config/env-vars @@ -8,10 +8,22 @@ export OPENSTACK_OSA_GIT_URL=https://git.openstack.org/openstack/openstack-ansib export OPENSTACK_OSA_OPENRC_GIT_URL=https://git.openstack.org/openstack/openstack-ansible-openstack_openrc export OPENSTACK_OSA_ETC_PATH=/etc/openstack_deploy export OPNFV_HOST_IP=192.168.122.2 -export OPNFV_XCI_PATH=$OPNFV_RELENG_PATH/xci -export XCI_FLAVOR_ANSIBLE_FILE_PATH=$OPNFV_XCI_PATH/file/$XCI_FLAVOR +export XCI_FLAVOR_ANSIBLE_FILE_PATH=$XCI_PATH/xci/file/$XCI_FLAVOR export CI_LOOP=${CI_LOOP:-daily} export JOB_NAME=${JOB_NAME:-false} +export XCI_CACHE=${XCI_PATH}/.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 +#------------------------------------------------------------------------------- +export OPENSTACK_BIFROST_PATH="${XCI_CACHE}/repos/bifrost" +export OPENSTACK_OSA_PATH="${XCI_CACHE}/repos/openstack-ansible" + +# Logging +export LOG_PATH=${LOG_PATH:-${XCI_PATH}/xci/logs} + # This currently matches to OSA Ansible version but it doesn't really # matter since bifrost and OSA will use the Ansible version they need. # Overall, it's better to use what OSA supports so we can use new features. -- cgit