Bump bifrost sha and set UPPER_CONSTRAINTS_FILE

The lack of UC means that pip is attempting to install libvirt-python 4.1.0,
which is failing on Ubuntu due to
    https://bugs.launchpad.net/openstack-requirements/+bug/1753539.
Currently upper-constraints limits libvirt-python to 4.0.0, which does not
have this issue.

Change-Id: Idc97a0d9928cebafc9167614723236d2584cc93f
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>

diff --git a/bifrost/scripts/bifrost-provision.sh b/bifrost/scripts/bifrost-provision.sh
index d641d50..e64277d 100755 (executable)
--- a/bifrost/scripts/bifrost-provision.sh
+++ b/bifrost/scripts/bifrost-provision.sh
@@ -28,6 +28,9 @@ BIFROST_IRONIC_INSPECTOR_CLIENT_VERSION=${BIFROST_IRONIC_INSPECTOR_CLIENT_VERSIO
 BIFROST_IRONIC_CLIENT_VERSION=${BIFROST_IRONIC_CLIENT_VERSION:-master}
 BIFROST_IRONIC_VERSION=${BIFROST_IRONIC_VERSION:-master}
 
+# set UPPER_CONSTRAINTS_FILE since it is needed in order to limit libvirt-python to 4.0.0
+export UPPER_CONSTRAINTS_FILE=https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt
+
 # Ensure the right inventory files is used based on branch
 CURRENT_BIFROST_BRANCH=$(git rev-parse --abbrev-ref HEAD)
 if [ $CURRENT_BIFROST_BRANCH = "master" ]; then

diff --git a/xci/config/pinned-versions b/xci/config/pinned-versions
index cdf283b..5d5908e 100755 (executable)
--- a/xci/config/pinned-versions
+++ b/xci/config/pinned-versions
@@ -26,7 +26,7 @@
 # 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 13.02.2018
-export OPENSTACK_BIFROST_VERSION=${OPENSTACK_BIFROST_VERSION:-"f3cf0d9fff6ec08ba0e46cbde5bfebfd77a26752"}
+export OPENSTACK_BIFROST_VERSION=${OPENSTACK_BIFROST_VERSION:-"28b6b8c96f89532bbddeca513285e6c00db89205"}
 # HEAD of ironic "master" as of 13.02.2018
 export BIFROST_IRONIC_VERSION=${BIFROST_IRONIC_VERSION:-"9b8440aa318e4883a74ef8640ad5409dd22858a9"}
 # HEAD of ironic-client "master" as of 13.02.2018