RPM: Apex: Refactor build scripts:

Remove reference to undercloud.
Fix dependencies list.
Refactor build ovs and build dpdk and test scripts.
Correct default dpdk version in build ovs script.
Remove references to instack VM -- no longer necessary.
Remove script using custom Apex-lite-liberty for testing
Consolidated functions and cleanup in response to reviewers.

Change-Id: I0875acd87580769c7cd7e87b97bb3e04f0159b32
Signed-off-by: Thomas F Herbert <therbert@redhat.com>

1 files changed, 10 insertions, 15 deletions

diff --git a/build/test_ovs_rpm.sh b/build/test_ovs_rpm.sh
index d0b9174..6fff26a 100755
--- a/build/test_ovs_rpm.sh
+++ b/build/test_ovs_rpm.sh
@@ -17,28 +17,19 @@
 set -e
 
 echo "==============================="
+echo "Requires sudo privileges"
 echo executing $0 $@
 echo executing on machine `uname -a`
 
 
 usage() {
-    echo run BuildAndTest -h for help
+    echo $0 [-d] [-k]
+    echo -d -- Test with DPDK
+    echo -k -- Load linux kernel module
 }
 
-function delrpm() {
-    set +e
-    rpm -q $1
-    if [ $? -eq 0 ]; then
-        sudo rpm -e --allmatches $1
-    fi
-    set -e
-}
-function cleanrpms() {
-    delrpm openvswitch
-    delrpm dpdk-devel
-    delrpm dpdk-tools
-    delrpm dpdk-examples
-    delrpm dpdk
+function uninstallrpms() {
+    cleanrpms
 }
 
 while getopts "dg:hkp:u:v" opt; do
@@ -69,6 +60,9 @@ HOME=`pwd`
 TOPDIR=$HOME
 TMPDIR=$TOPDIR/ovsrpm
 
+BUILDDIR=$HOME
+source $BUILDDIR/functions.sh
+
 if [ -d $TMPDIR ]
 then
     rm -rf $TMPDIR
@@ -134,5 +128,6 @@ sudo ovs-vsctl add-br brtest
 sudo ovs-ofctl dump-flows brtest
 sudo ovs-vsctl del-br brtest
 sudo service openvswitch stop
+uninstallrpms
 
 exit 0