From 75f93c362f8cde64b02e243d26bf9061f48adc34 Mon Sep 17 00:00:00 2001 From: shravani Date: Fri, 9 Dec 2016 17:57:27 +0530 Subject: This patch includes scripts to create multiple yaml file for different environments and run cyclictest. Also contains updated interface scripts to trigger packetforwarding and cyclictest stress scripts. Change-Id: Ibb8694746f8b19d605e50ea07c2be8b2bd141ec0 Co-Authored-By: Y Rajitha Co-Authored-By: Gundarapu Kalyan Reddy Signed-off-by: Shravani --- ci/envs/cyclictest.sh | 3 ++- ci/envs/host-setup1.sh | 11 +++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'ci/envs') diff --git a/ci/envs/cyclictest.sh b/ci/envs/cyclictest.sh index 805f9088f..920a46b93 100755 --- a/ci/envs/cyclictest.sh +++ b/ci/envs/cyclictest.sh @@ -7,9 +7,10 @@ source utils.sh testType=$1 #daily/verify/merge +testName=$2 #idle_idle/stress_idle HOST_IP=$( getHostIP ) pod_config='/opt/scripts/pod.yaml' -cyclictest_context_file='/opt/kvmfornfv_cyclictest_idle_idle.yaml' +cyclictest_context_file='/opt/kvmfornfv_cyclictest_'${testName}'.yaml' if [ ! -f ${pod_config} ] ; then echo "file ${pod_config} not found" diff --git a/ci/envs/host-setup1.sh b/ci/envs/host-setup1.sh index 3d2de6ddf..e2c028a7a 100755 --- a/ci/envs/host-setup1.sh +++ b/ci/envs/host-setup1.sh @@ -39,16 +39,19 @@ echo 0 > /proc/sys/kernel/watchdog echo 0 > /proc/sys/kernel/nmi_watchdog # Change RT priority of ksoftirqd and rcuc kernel threads on isolated CPUs +startVal=$(echo ${host_isolcpus} | cut -f1 -d-) +endVal=$(echo ${host_isolcpus} | cut -f2 -d-) i=0 -for c in `echo $host_isolcpus | sed 's/,/ /g'` ; do - tid=`pgrep -a ksoftirq | grep "ksoftirqd/${c}$" | cut -d ' ' -f 1` +while [ ${startVal} -lt ${endVal} ]; do + tid=`pgrep -a ksoftirq | grep "ksoftirqd/${startVal}$" | cut -d ' ' -f 1` chrt -fp 2 ${tid} - tid=`pgrep -a rcuc | grep "rcuc/${c}$" | cut -d ' ' -f 1` + tid=`pgrep -a rcuc | grep "rcuc/${startVal}$" | cut -d ' ' -f 1` chrt -fp 3 ${tid} - cpu[$i]=${c} + cpu[$i]=${startVal} i=`expr $i + 1` + startVal=`expr $startVal + 1` done # Change RT priority of rcub kernel threads -- cgit 1.2.3-korg