From: Jiang, Yunhong <yunhong.jiang@intel.com>
Date: Tue, 16 May 2017 20:34:40 +0000 (+0000)
Subject: Merge "Adding breaktrace & disabling timer migration"
X-Git-Tag: opnfv-5.0.0~16
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a14b48d18a9ed03ec191cf16b162206998a895ce;hp=46b981c1a4c45072a6b6a491de4cd949130d0712;p=kvmfornfv.git

Merge "Adding breaktrace & disabling timer migration"
---

diff --git a/ci/envs/guest-setup1.sh b/ci/envs/guest-setup1.sh
index 678baa43b..6d790a080 100755
--- a/ci/envs/guest-setup1.sh
+++ b/ci/envs/guest-setup1.sh
@@ -24,3 +24,6 @@ set_irq_affinity
 # Disable RT throttling
 echo -1 > /proc/sys/kernel/sched_rt_period_us
 echo -1 > /proc/sys/kernel/sched_rt_runtime_us
+
+# Disable the timer migration
+echo 0 > /proc/sys/kernel/timer_migration
diff --git a/docker_image_build/Dockerfile b/docker_image_build/Dockerfile
index 6af1176f4..f292bf2f5 100644
--- a/docker_image_build/Dockerfile
+++ b/docker_image_build/Dockerfile
@@ -4,7 +4,7 @@
 #kvmfornfv1 image has all dependency packages installed.
 #
 FROM kvmfornfv1:latest
-RUN cd /root && git clone https://gerrit.opnfv.org/gerrit/p/yardstick.git -b stable/danube
+RUN cd /root && git clone https://gerrit.opnfv.org/gerrit/p/yardstick.git
 RUN sed -i -e "s/3600/9000/g" /root/yardstick/yardstick/ssh.py
 RUN cd /root/yardstick && python setup.py install
 WORKDIR /root
diff --git a/tests/kvmfornfv_cyclictest_hostenv_guestenv.yaml b/tests/kvmfornfv_cyclictest_hostenv_guestenv.yaml
index 155cd5dbd..99c474c00 100644
--- a/tests/kvmfornfv_cyclictest_hostenv_guestenv.yaml
+++ b/tests/kvmfornfv_cyclictest_hostenv_guestenv.yaml
@@ -5,7 +5,7 @@
 # For this sample just like running the command below on the test vm and
 # getting latencies info back to the yardstick.
 #
-# sudo bash cyclictest -a 1 -i 1000 -p 99 -l 1000 -t 1 -h 90 -m -n -q
+# sudo bash cyclictest -a 1 -b 1200000 -i 1000 -p 99 -l 1000 -t 1 -h 90 -m -n -q
 #
 
 schema: "yardstick:task:0.1"
@@ -15,6 +15,7 @@ scenarios:
   type: Cyclictest
   options:
     affinity: 1
+    breaktrace: 1200000
     interval: 1000
     priority: 99
     loops: 600000