Updated openstack/openstack
Project: openstack-dev/pbr  629bbce1c88a4a576182c7a41372a70a864d8226
null
Fixed pbr install to not error out and fail if git is not installed

Fixed the issue where pbr was erroring out (file not found) when
running 'python setup.py egg_info' since it was trying to get the
.git directory even if git was not installed.

Closes bug 1245676

Change-Id: I31e1f86f10f18897774b49eb293aede31641db31
Updated openstack/openstack
Project: openstack-infra/devstack-gate  ddaa885cfb0f3e7dd071593bb54e31200412b033
null
Correct test for zuulifying the tree

The new zuulification of old requires that we know that we are on
the branch which corresponds to the old change. This means that
instead of having a flag to setup_workspace about whether we are
supposed to set it up, we instead need a check to ensure that it's
actually the ZUUL_BRANCH.

The previous attempt at this failed because the condition was too
nested because I didn't not fully understand the complexity of the
multilevel, multiply segmented, if condition that this was
attempted to be inserted into. By fully extracting it one level
this should be correct.

Change-Id: Ie787de3cb0b42b6b53b149dd528e0a20aae5c328