Removes building OVS 2.6.1 with NSH

[apex.git] / build / overcloud-full.sh

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 6fdc32d..cc335c8 100755 (executable)
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -152,34 +152,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     # upload and install barometer packages
     barometer_pkgs overcloud-full_build.qcow2
 
-    # 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}/CentOS-Updates.repo:/etc/yum.repos.d/ \
-    --run-command "yum -y install kernel-devel-\$(rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel)" \
-    --run-command "yum -y install kernel-headers-\$(rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel)" \
-    --run-command "yum -y install kernel-tools-\$(rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel)" \
-    --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
-
 fi # end x86_64 specific items
 
 mv -f overcloud-full_build.qcow2 overcloud-full.qcow2