X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2Finstack_ovs.sh;h=4c258a43c6efcc4c2bcfd8a1ed570fdb407c0261;hb=1ce9fdfca431b528d66704a26fdf9904e325a894;hp=c4378d9fbec446e7eb56a23e64fc449255489c3d;hpb=4c54b37aca48867c694539692a3ada76be39f4d6;p=ovsnfv.git

diff --git a/build/instack_ovs.sh b/build/instack_ovs.sh
index c4378d9..4c258a4 100755
--- a/build/instack_ovs.sh
+++ b/build/instack_ovs.sh
@@ -26,6 +26,7 @@ while getopts "a:dg:hi:p:tu:v" opt; do
             ;;
         d)
             DPDK="yes"
+            setdpdk="-d"
             ;;
         g)
             TAG=${OPTARG}
@@ -58,8 +59,10 @@ echo ===============================================
 echo Default Configuration Options.
 echo ===============================================
 echo option NOCHECK is set to $NOCHECK
+echo build DPDK option is set to $DPDK
 echo DPDK Patch URL is set to $DPDK_PATCH
-echo Build and Test OVS Kernel Module is set to $KMOD
+echo DPDK Version is set to $DPDK_VERSION
+echo Option for OVS Kernel Module is set to $KMOD
 echo ===============================================
 if [[ $NOCHECK =~ "yes" ]]; then
     setnocheck="-c"
@@ -194,7 +197,7 @@ fi
 sudo rm -f /tmp/instack.answers
 
 # ensure that no previous undercloud VMs are running
-clean.sh
+sudo ../ci/clean.sh
 # and rebuild the bare undercloud VMs
 ssh -T ${SSH_OPTIONS[@]} stack@localhost <<EOI
     set -e
@@ -234,13 +237,19 @@ done
 
 # yum update undercloud and reboot.
 ssh -T ${SSH_OPTIONS[@]} "root@$UNDERCLOUD" <<EOI
-set -e
+    set -e
 
-echo yum -y update
-yum -y update
+    echo "----------------------------------------------------------------"
+    echo yum update and install pciutils prereqs for DPDK tools and samples.
+    echo
+    yum -y update
+    yum -y install pciutils libvirt
 EOI
 
-virsh reboot instack
+# reboot VM
+ssh -T ${SSH_OPTIONS[@]} stack@localhost <<EOI
+    virsh reboot instack
+EOI
 sleep 30
 
 # yum repo, triple-o package and ssh key setup for the undercloud
@@ -312,7 +321,9 @@ scp ${SSH_OPTIONS[@]} stack@$UNDERCLOUD:instackenv.json stack/instackenv.json
 #
 echo If using special kernel version, reboot undercloud vm
 if [ -z $kernel_version ]; then
-    virsh reboot instack
+    ssh -T ${SSH_OPTIONS[@]} stack@localhost <<EOI
+        virsh reboot instack
+EOI
     sleep 15
 fi
 
@@ -325,37 +336,66 @@ echo Copy build and test scripts to undercloud vm.
 echo BUILD_BASE is $BUILD_BASE
 scp ${SSH_OPTIONS[@]} $BUILD_BASE/build_ovs_rpm.sh stack@$UNDERCLOUD:
 scp ${SSH_OPTIONS[@]} $BUILD_BASE/test_ovs_rpm.sh stack@$UNDERCLOUD:
-
 #
-# build rpm on undercloud.
+# build dpdk rpm locally.
+#
+if [[ "$DPDK" =~ "yes" ]]; then
+    echo Build DPDK RPMs
+    ./build_dpdk_rpm.sh -g $DPDK_VERSION
+fi
+#
+# Build rpm on undercloud if custom kernel module is required otherwise build
+# locally.
 #
 if [ ! -z $kernel_version ]; then
     echo build rpm on undercloud with kernel version $kernel_version
     ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
         ./build_ovs_rpm.sh -a $kernel_major $setnocheck -g $TAG -i $kernel_minor -k -p $OVS_PATCH -u $OVS_REPO_URL
 EOI
+    scp ${SSH_OPTIONS[@]} stack@UNDERCLOUD:*.rpm $RPMDIR/RPMS/
+elif [[ "$DPDK" =~ "yes" ]]; then
+    echo Build ovs with DPDK locally
+    #
+    # Build locally and copy RPMS to undercloud vm for testing
+    # and copy RPMS to temporary release dir.
+    #
+    ./build_ovs_rpm.sh $setnocheck -d -g $TAG -p $OVS_PATCH -u $OVS_REPO_URL
 else
-    # build locally and copy RPMS to undercloud vm for testing
+    # Build locally and copy RPMS to undercloud vm for testing
     # and copy RPMS to temporary release dir.
     #
-    echo build rpm on undercloud
-    ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
-        ./build_ovs_rpm.sh $setnocheck -g $TAG $setkmod -p $OVS_PATCH -u $OVS_REPO_URL
-EOI
+    echo build OVS rpm locally
+    ./build_ovs_rpm.sh $setnocheck -g $TAG $setkmod -p $OVS_PATCH -u $OVS_REPO_URL
 fi
 #
 # Test rpm on undercloud vm
+# TODO: Undercloud VM doesn't support sse3 instruction needed set to run DPDK
 #
-if [[ ! -z $TESTRPM ]]; then
-    echo Test rpm on undercloud vm
-    ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
-        ./test_ovs_rpm.sh $setkmod
+if [ ! -z $TESTRPM ]; then
+    if [ -z $DPDK ]; then
+        echo "-----------------------------------------"
+        echo Test rpm on undercloud vm
+        echo Copy all RPMS to undercloud for testing.
+        echo
+        scp ${SSH_OPTIONS[@]} $RPMDIR/RPMS/x86_64/* stack@$UNDERCLOUD:
+        scp ${SSH_OPTIONS[@]} $RPMDIR/SOURCES/dpdk*.rpm stack@$UNDERCLOUD:
+        ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
+            ./test_ovs_rpm.sh $setdpdk $setkmod
 EOI
+    else
+        echo "-----------------------------------------"
+        echo "TODO: Undercloud VM doesn't support sse3 instruction needed DPDK."
+        echo "DPDK is required, therefore test DPDK/OVS RPM in host"
+        echo
+        ./test_ovs_rpm.sh $setdpdk $setkmod
+    fi
 fi
+
 #
-# copy rpms from undercloud back to host
+# If tests pass, copy rpms to release dir
 #
+echo copy rpms to release dir
 echo copy rpms from undercloud back to $TMP_RELEASE_DIR in host
-scp ${SSH_OPTIONS[@]} stack@$UNDERCLOUD:rpmbuild/RPMS/x86_64/*.rpm $TMP_RELEASE_DIR
+cp $RPMDIR/RPMS/x86_64/* $TMP_RELEASE_DIR
 
 exit 0