x
/
fuel-plugin-bgpvpn
Code Issues Proposed changes

Networking-BGPVPN Fixing stable/liberty branch 

While the time the patch
https://review.openstack.org/#/c/274552/2
Is not added yet this commit will guarantee
that the stable/liberty branch is
deployable.

Change-Id: Ic3ed7fea4dcbf2e76e6fa9195b29c9f06ac798e4
This commit is contained in:
Nikolas Hermanns 2016-02-15 12:13:05 +01:00
parent 27c8f60947
commit fa803b03e7
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pre_build_hook
View File

@ -23,6 +23,14 @@ function cleanup {
rm -rf "${TMP_DIR}"
}
function patch_bgpvpn {
# test if patch is needed
git fetch ssh://enikher@review.openstack.org:29418/openstack/networking-bgpvpn refs/changes/52/274552/2 && git format-patch -1 --stdout FETCH_HEAD > ./odl-client-patch
patch -p1 -N --dry-run < ./odl-client-patch && patch -p1 -N < ./odl-client-patch || true
sed -i -- 's/sphinxcontrib-blockdiag//' ./requirements.txt
sed -i -- 's/sphinxcontrib-seqdiag//' ./requirements.txt
}
function build_pkg {
case $1 in
ubuntu)
@ -59,8 +67,7 @@ pushd $TMP_DIR
git clone $NETWORKING_BGPVPN_REPO networking-bgpvpn
pushd networking-bgpvpn
git checkout $NETWORKING_BGPVPN_BRANCH
sed -i -- 's/sphinxcontrib-blockdiag//' ./requirements.txt
sed -i -- 's/sphinxcontrib-seqdiag//' ./requirements.txt
patch_bgpvpn
popd
git clone $NETWORKING_ODL_REPO networking_odl
pushd networking_odl