From: Jiang, Yunhong <yunhong.jiang@intel.com>
Date: Mon, 10 Apr 2017 06:41:36 +0000 (+0000)
Subject: Merge "Publishing packet forwarding test cases results."
X-Git-Tag: opnfv-5.0.0~32
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=39928e5e9503db6f1971c74a84e3d10a4e4f6a6e;hp=070df31c821a397796047c0a59474ba16ec1c7dd;p=kvmfornfv.git

Merge "Publishing packet forwarding test cases results."
---

diff --git a/ci/envs/enable-trace.sh b/ci/envs/enable-trace.sh
index e360de137..93e24cb38 100755
--- a/ci/envs/enable-trace.sh
+++ b/ci/envs/enable-trace.sh
@@ -47,12 +47,11 @@ bash -c "echo 1 > $TRACEDIR/events/kvm/enable"
 bash -c "echo 1 > $TRACEDIR/events/workqueue/enable"
 bash -c "echo 1 > $TRACEDIR/events/power/enable"
 bash -c "echo 1 > $TRACEDIR/events/signal/enable"
-
-bash -c "echo 1 > events/tlb/enable"
+bash -c "echo 1 > $TRACEDIR/events/tlb/enable"
 
 # Clean original log info
 bash -c "echo > $TRACEDIR/trace"
-bash -c "echo function > $TRACEDIR/current_tracer"
+#bash -c "echo function > $TRACEDIR/current_tracer"
 sysctl kernel.ftrace_enabled=1
 #echo 0 >tracing_on; sleep 1; echo 1 >tracing_on; sleep 20; echo 0 >tracing_on;sleep 1; cat trace >/tmp/123.txt
 bash -c "echo 1 >$TRACEDIR/tracing_on"
diff --git a/ci/envs/host-run-qemu.sh b/ci/envs/host-run-qemu.sh
index 389790eda..631adfc00 100755
--- a/ci/envs/host-run-qemu.sh
+++ b/ci/envs/host-run-qemu.sh
@@ -31,6 +31,7 @@ qmp_sock="/tmp/qmp-sock"
 #    -nographic -serial /dev/null -parallel /dev/null
 
 ${qemu} -smp ${guest_cpus} -monitor unix:${qmp_sock},server,nowait \
+     -cpu host,migratable=off,+invtsc,+tsc-deadline,pmu=off \
      -drive file=/root/guest1.qcow2 -daemonize \
      -netdev user,id=net0,hostfwd=tcp:$HOST_IP:5555-:22 \
      -realtime mlock=on -mem-prealloc -enable-kvm -m 1G \
diff --git a/fuel-plugin/build_kvm.sh b/fuel-plugin/build_kvm.sh
index 3fc80dfb7..cc1df2791 100755
--- a/fuel-plugin/build_kvm.sh
+++ b/fuel-plugin/build_kvm.sh
@@ -3,7 +3,6 @@
 SRC=/root
 CONFIG="arch/x86/configs/opnfv.config"
 VERSION="1.0.OPNFV"
-OVS_COMMIT="4ff6642f3c1dd8949c2f42b3310ee2523ee970a6"
 
 quirks() {
 #
@@ -27,12 +26,6 @@ apt-get install -y git fakeroot build-essential ncurses-dev xz-utils kernel-pack
 #   building wouldn't remain in the source directory mapped into Docker container
 #
 cp -r /kvmfornfv $SRC/.
-cd $SRC
-
-# Get the Open VSwitch sources
-rm -rf ovs
-git clone https://github.com/openvswitch/ovs.git
-cd ovs; git checkout $OVS_COMMIT
 
 cd $SRC/kvmfornfv/
 quirks kernel
@@ -55,24 +48,5 @@ make-kpkg clean
 
 fakeroot make-kpkg --initrd --revision=$VERSION kernel_image kernel_headers
 
-# Build OVS kernel modules
-cd ../../ovs
-
-quirks ovs
-pip install six
-
-./boot.sh
-./configure --with-linux=$SRC/kvmfornfv/kernel
-make
-
-# Add OVS kernel modules to kernel deb
-dpkg-deb -x $SRC/kvmfornfv/linux-image*.deb ovs.$$
-dpkg-deb --control $SRC/kvmfornfv/linux-image*.deb ovs.$$/DEBIAN
-cp datapath/linux/*.ko ovs.$$/lib/modules/*/kernel/net/openvswitch
-depmod -b ovs.$$ -a `ls ovs.$$/lib/modules`
-dpkg-deb -b ovs.$$ $SRC/kvmfornfv/linux-image*.deb
-rm -rf ovs.$$
-
 cp $SRC/kvmfornfv/linux-headers*.deb /kvmfornfv/.
 cp $SRC/kvmfornfv/linux-image*.deb /kvmfornfv/.
-