diff options
| author |   Markos Chandras <mchandras@suse.de> | 2018-03-07 17:40:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-07 17:40:09 +0000 |
| commit | c4651cc986ac5277d95027df77bc42cc783f2777 (patch) | |
| tree | 40634ed3f980bffc473a8923ea1ea62aa951532a | |
| parent | 92f89a5d2028675cf03d8b828da1fd7233f77115 (diff) | |
| parent | 448c53c6780f3f51bcd3fad95dbacdc85334ce46 (diff) | |
Merge "Bump bifrost sha and set UPPER_CONSTRAINTS_FILE"
| -rwxr-xr-x | bifrost/scripts/bifrost-provision.sh | 3 | ||||
| -rwxr-xr-x | xci/config/pinned-versions | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/bifrost/scripts/bifrost-provision.sh b/bifrost/scripts/bifrost-provision.sh index d641d506..e64277d6 100755 --- 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 cdf283b5..5d5908e7 100755 --- 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 |