From 973920421d98159a3d91790859061ee718cd1e07 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Tue, 12 Jun 2018 17:39:04 +0200 Subject: xci: Bump OSA and bifrost SHAs This change - bumps OSA SHA to cbfdb7dc295ff702044b807336fab067d84a3f20 (mostly based on Rocky RC1) - bumps bifrost SHA to c1c6fb7487d5b967624400623fd35aabf303b917 - pins Ansible to 2.4.6.0 - switches to ollivier/functest-healtcheck since OS is bumped to Rocky Change-Id: Icc14e3e794b489dafd78b426c54051a3732ccb1a Signed-off-by: Fatih Degirmenci Signed-off-by: Markos Chandras --- xci/config/env-vars | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'xci/config/env-vars') diff --git a/xci/config/env-vars b/xci/config/env-vars index 23388829..ba68290b 100755 --- a/xci/config/env-vars +++ b/xci/config/env-vars @@ -46,7 +46,10 @@ 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. -export XCI_ANSIBLE_PIP_VERSION=${XCI_ANSIBLE_PIP_VERSION:-$(curl -s https://raw.githubusercontent.com/openstack/openstack-ansible/${OPENSTACK_OSA_VERSION}/scripts/bootstrap-ansible.sh | grep ansible== | sed -n "s/.*ansible==\([0-9.]*\).*/\1/p")} +#export XCI_ANSIBLE_PIP_VERSION=${XCI_ANSIBLE_PIP_VERSION:-$(curl -s https://raw.githubusercontent.com/openstack/openstack-ansible/${OPENSTACK_OSA_VERSION}/scripts/bootstrap-ansible.sh | grep ansible== | sed -n "s/.*ansible==\([0-9.]*\).*/\1/p")} +# bifrost needs 2.4 but OSA is currently on 2.6 +export XCI_ANSIBLE_PIP_VERSION="2.4.6.0" + export ANSIBLE_HOST_KEY_CHECKING=False # subject of the certificate export XCI_SSL_SUBJECT=${XCI_SSL_SUBJECT:-"/C=US/ST=California/L=San Francisco/O=IT/CN=xci.releng.opnfv.org"} -- cgit 1.2.3-korg