xci: Bump OSA and bifrost SHAs

This change
- bumps OSA SHA to b9d9269528ecbe04b2638a73c2b0f49839f27422
- bumps bifrost SHA to 0d0cfd908d10a670668619c575fd338d1ff328b7
- Pins Ansible to 2.5.8. OSA is using 2.5.5 which has a bug in the pause
  module so we need to use something newer.

Change-Id: Idf05bbef880db11de4a41464ae5080aa21a0613c
Signed-off-by: Markos Chandras <mchandras@suse.de>

2 files changed, 14 insertions, 12 deletions

diff --git a/xci/config/env-vars b/xci/config/env-vars
index 36ae97c0..898c5722 100755
--- a/xci/config/env-vars
+++ b/xci/config/env-vars
@@ -45,9 +45,11 @@ 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.
+# OSA currently has 2.5.5 which breaks due to missing
+# https://github.com/ansible/ansible/commit/67859c3476501d5d9839fd904aec55468d09593a
+# This was fixed in 2.5.6 so remove the pin when OSA updates to newer version.
 #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 XCI_ANSIBLE_PIP_VERSION="2.5.8"
 
 export ANSIBLE_HOST_KEY_CHECKING=False
 # subject of the certificate
diff --git a/xci/config/pinned-versions b/xci/config/pinned-versions
index b5f5480d..00340f30 100755
--- a/xci/config/pinned-versions
+++ b/xci/config/pinned-versions
@@ -25,18 +25,18 @@
 #-------------------------------------------------------------------------------
 # 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 17.08.2018
-export OPENSTACK_BIFROST_VERSION=${OPENSTACK_BIFROST_VERSION:-"c1c6fb7487d5b967624400623fd35aabf303b917"}
-# HEAD of ironic "master" as of 17.08.2018
-export BIFROST_IRONIC_VERSION=${BIFROST_IRONIC_VERSION:-"d792111b46e37181f1447d697f32a6023208df04"}
-# HEAD of ironic-client "master" as of 17.08.2018
+# HEAD of bifrost "master" as of 30.08.2018
+export OPENSTACK_BIFROST_VERSION=${OPENSTACK_BIFROST_VERSION:-"0d0cfd908d10a670668619c575fd338d1ff328b7"}
+# HEAD of ironic "master" as of 30.08.2018
+export BIFROST_IRONIC_VERSION=${BIFROST_IRONIC_VERSION:-"0a10eb7794e1543ce2be09c0a55b62fa005b0710"}
+# HEAD of ironic-client "master" as of 30.08.2018
 export BIFROST_IRONIC_CLIENT_VERSION=${BIFROST_IRONIC_CLIENT_VERSION:-"d30d415684f979fa78c70a738f90dab06b77a046"}
-# HEAD of ironic-inspector "master" as of 17.08.2018
-export BIFROST_IRONIC_INSPECTOR_VERSION=${BIFROST_IRONIC_INSPECTOR_VERSION:-"be06e77dabbbd5ffa4ff48a1a676305c4db2f581"}
-# HEAD of ironic-inspector-client "master" as of 17.08.2018
+# HEAD of ironic-inspector "master" as of 30.08.2018
+export BIFROST_IRONIC_INSPECTOR_VERSION=${BIFROST_IRONIC_INSPECTOR_VERSION:-"56138d8f06f531fadc184b0e0efa537c9ad66022"}
+# HEAD of ironic-inspector-client "master" as of 30.08.2018
 export BIFROST_IRONIC_INSPECTOR_CLIENT_VERSION=${BIFROST_IRONIC_INSPECTOR_CLIENT_VERSION:-"6eed85c38ee63ade0c2720120fbc9d0520c14f55"}
-# HEAD of osa "stable/rocky" as of 17.08.2018
-export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"cbfdb7dc295ff702044b807336fab067d84a3f20"}
+# HEAD of osa "stable/rocky" as of 30.08.2018
+export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"b9d9269528ecbe04b2638a73c2b0f49839f27422"}
 export KEEPALIVED_VERSION=$(grep -E '.*name: keepalived' -A 3 \
        ${XCI_PATH}/xci/installer/osa/files/ansible-role-requirements.yml \
        | tail -n1 | sed -n 's/\(^.*: \)\([0-9a-z].*$\)/\2/p')