diff options
| -rwxr-xr-x | ci/cyclicTestTrigger.sh | 2 | ||||
| -rwxr-xr-x | ci/envs/enable-trace.sh | 5 | ||||
| -rwxr-xr-x | ci/envs/host-run-qemu.sh | 1 | ||||
| -rwxr-xr-x | ci/test_kvmfornfv.sh | 5 |
4 files changed, 6 insertions, 7 deletions
diff --git a/ci/cyclicTestTrigger.sh b/ci/cyclicTestTrigger.sh index 640a0738a..6765569f6 100755 --- a/ci/cyclicTestTrigger.sh +++ b/ci/cyclicTestTrigger.sh @@ -189,7 +189,7 @@ function runCyclicTest { sudo docker run -i -v ${volume}:/opt --net=host --name kvmfornfv_${testType}_${testName} \ kvmfornfv:latest /bin/bash -c "cd /opt/scripts && ls; ./cyclictest.sh $testType $testName" cyclictest_output=$? - if [ "$testName" == "iostress_idle" ];then + if [ "$testName" == "memorystress_idle" ];then copyLogs fi 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/ci/test_kvmfornfv.sh b/ci/test_kvmfornfv.sh index 3185c4652..92f422827 100755 --- a/ci/test_kvmfornfv.sh +++ b/ci/test_kvmfornfv.sh @@ -14,7 +14,7 @@ test_type=$1 test_name=$2 ftrace_enable=0 -cyclictest_env_verify=("idle_idle" "cpustress_idle" "memorystress_idle" "iostress_idle") #cyclictest environment +cyclictest_env_verify=("idle_idle" "memorystress_idle") #cyclictest environment cyclictest_env_daily=("idle_idle" "cpustress_idle" "memorystress_idle" "iostress_idle") cyclictest_result=0 #exit code of cyclictest packetforward_result=0 #exit code of packet forward @@ -127,8 +127,7 @@ if [ ${test_type} == "verify" ];then for env in ${cyclictest_env_verify[@]} do #Executing cyclictest through yardstick. - #cyclictest ${env} - echo "Debugging in progress.Execution of cyclictest is disabled" + cyclictest ${env} sleep 10 done #Execution of packet forwarding test cases. |