From a90e29d412664322bb5b0602ae4870439a0ed038 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Tue, 20 Dec 2016 11:40:02 -0500 Subject: Removes OVS NSH from build process The build is failing with newest kernel version. We also don't pan on using ovs 2.5.90 for Danube, so it is safe to remove this until we integrate the SFC scenario. JIRA: APEX-378 Change-Id: Ia41f62711270ba5e1ad641a862e82e43b1f370e4 Signed-off-by: Tim Rozet --- build/overcloud-full.sh | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 75330f3d..e97ae70a 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -151,27 +151,5 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "cd /usr/lib/python2.7/site-packages/ && git apply /tmp/osc_auth_fix.diff" \ -a overcloud-full_build.qcow2 -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 reset --hard 7d433ae57ebb90cd68e8fa948a096f619ac4e2d8 -cp ../ovs_nsh_patches/*.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 - -# BUILD NSH OVS -LIBGUESTFS_BACKEND=direct virt-customize \ - --upload ${BUILD_ROOT}/build_ovs_nsh.sh:/root/ \ - --upload ${BUILD_DIR}/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 -- cgit 1.2.3-korg