diff options
| author |   Feng Pan <fpan@redhat.com> | 2017-08-03 11:07:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-03 11:07:34 +0000 |
| commit | 5f19f129420ceb97c08641fc945335c0ef1b1083 (patch) | |
| tree | 5505f807b3ef4d9633bcd773dd2b8b066d3a9959 /build/overcloud-full.sh | |
| parent | 38b3b1399f60412ef3afcab977707bb762972e17 (diff) | |
| parent | 48cbae08f2df3cde9a35c539a75a0655f6f64872 (diff) | |
Merge "Builds and installs ovs 2.6.1 with NSH support"
Diffstat (limited to 'build/overcloud-full.sh')
| -rwxr-xr-x | build/overcloud-full.sh | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 7b008890..02455402 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -152,5 +152,28 @@ if [ "$(uname -i)" == 'x86_64' ]; then barometer_pkgs overcloud-full_build.qcow2 fi +# Build OVS with NSH +rm -rf ovs_nsh_patches +rm -rf ovs +git clone https://github.com/yyang13/ovs_nsh_patches.git +git clone https://github.com/openvswitch/ovs.git +pushd ovs > /dev/null +git checkout v2.6.1 +cp ../ovs_nsh_patches/v2.6.1/*.patch ./ +cp ${BUILD_ROOT}/patches/ovs-fix-build-on-RHEL-7.3.patch ./ +# Hack for build servers that have no git config +git config user.email "apex@opnfv.com" +git config user.name "apex" +git am *.patch +popd > /dev/null +tar czf ovs.tar.gz ovs + +LIBGUESTFS_BACKEND=direct virt-customize \ + --upload ${BUILD_ROOT}/build_ovs_nsh.sh:/root/ \ + --upload ovs.tar.gz:/root/ \ + --run-command "cd /root/ && tar xzf ovs.tar.gz" \ + --run-command "cd /root/ovs && /root/build_ovs_nsh.sh" \ + -a overcloud-full_build.qcow2 + mv -f overcloud-full_build.qcow2 overcloud-full.qcow2 popd > /dev/null |