diff options
Diffstat (limited to 'xci/config')
| -rwxr-xr-x | xci/config/env-vars | 5 | ||||
| -rwxr-xr-x | xci/config/pinned-versions | 2 | ||||
| -rwxr-xr-x | xci/config/user-vars | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/xci/config/env-vars b/xci/config/env-vars index 9d4c7825..f4a3facc 100755 --- a/xci/config/env-vars +++ b/xci/config/env-vars @@ -2,12 +2,13 @@ # !!! Changing or overriding these will most likely break everything altogether !!! # Please do not change these settings if you are not developing for XCI! #------------------------------------------------------------------------------- -export OPNFV_RELENG_GIT_URL=https://gerrit.opnfv.org/gerrit/releng.git +export OPNFV_RELENG_GIT_URL=https://gerrit.opnfv.org/gerrit/releng-xci.git export OPENSTACK_BIFROST_GIT_URL=https://git.openstack.org/openstack/bifrost export OPENSTACK_OSA_GIT_URL=https://git.openstack.org/openstack/openstack-ansible export OPENSTACK_OSA_ETC_PATH=/etc/openstack_deploy export OPNFV_HOST_IP=192.168.122.2 -export XCI_FLAVOR_ANSIBLE_FILE_PATH=$OPNFV_RELENG_PATH/prototypes/xci/file/$XCI_FLAVOR +export OPNFV_XCI_PATH=$OPNFV_RELENG_PATH/xci +export XCI_FLAVOR_ANSIBLE_FILE_PATH=$OPNFV_XCI_PATH/file/$XCI_FLAVOR export CI_LOOP=${CI_LOOP:-daily} export JOB_NAME=${JOB_NAME:-false} # TODO: this currently matches to bifrost ansible version diff --git a/xci/config/pinned-versions b/xci/config/pinned-versions index 58178607..121cb473 100755 --- a/xci/config/pinned-versions +++ b/xci/config/pinned-versions @@ -19,7 +19,7 @@ # export OPENSTACK_BIFROST_VERSION="a87f7ce6c8725b3bbffec7b2efa1e466796848a9" # export OPENSTACK_OSA_VERSION="4713cf45e11b4ebca9fbed25d1389854602213d8" #------------------------------------------------------------------------------- -# use releng from master until the development work with the sandbox is complete +# use releng-xci from master until the development work with the sandbox is complete export OPNFV_RELENG_VERSION="master" # HEAD of bifrost "master" as of 29.06.2017 export OPENSTACK_BIFROST_VERSION=${OPENSTACK_BIFROST_VERSION:-"7c9bb5e07c6bc3b42c9a9e8457e5eef511075b38"} diff --git a/xci/config/user-vars b/xci/config/user-vars index fd11a584..c960b904 100755 --- a/xci/config/user-vars +++ b/xci/config/user-vars @@ -29,7 +29,7 @@ export XCI_FLAVOR=${XCI_FLAVOR:-aio} # changing these paths might break things. #------------------------------------------------------------------------------- export XCI_DEVEL_ROOT=${XCI_DEVEL_ROOT:-"/tmp/.xci-deploy-env"} -export OPNFV_RELENG_PATH="${XCI_DEVEL_ROOT}/releng" +export OPNFV_RELENG_PATH="${XCI_DEVEL_ROOT}/releng-xci" export OPENSTACK_BIFROST_PATH="${XCI_DEVEL_ROOT}/bifrost" export OPENSTACK_OSA_PATH="${XCI_DEVEL_ROOT}/openstack-ansible" export OPNFV_SSH_HOST_KEYS_PATH="${XCI_DEVEL_ROOT}/ssh_host_keys" |