diff options
author | kalyanreddy <reddyx.gundarapu@intel.com> | 2017-04-12 17:48:25 +0530 |
---|---|---|
committer | kalyanreddy <reddyx.gundarapu@intel.com> | 2017-05-15 12:39:57 +0530 |
commit | 156570aeb2bd567890da31e4efecbe48d7129b8b (patch) | |
tree | f151b496e42b383cdfa3e36acb67e766f9f588dd /ci/cyclicTestTrigger.sh | |
parent | f9bc056239a4bad52403e96ae6b4d14eaedd012a (diff) |
Optimizing the code and uploading ftrace logs to artifacts
This patch is used to exclude execution of disable_trace.sh as
ftrace will be disabled during post-execution of cyclictest
through yardstick. Also includes uploading verify logs to
artifacts when ftrace is enabled for debugging.
Change-Id: I4674f2b9c03274eb2a96b3258a718c9f46419022
Signed-off-by: Gundarapu Kalyan Reddy <reddyx.gundarapu@intel.com>
Diffstat (limited to 'ci/cyclicTestTrigger.sh')
-rwxr-xr-x | ci/cyclicTestTrigger.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ci/cyclicTestTrigger.sh b/ci/cyclicTestTrigger.sh index 6765569f6..7f606b0b6 100755 --- a/ci/cyclicTestTrigger.sh +++ b/ci/cyclicTestTrigger.sh @@ -41,7 +41,6 @@ function verifyGuestImage { #disabling ftrace and collecting the logs to upload to artifact repository. function ftrace_disable { - sudo ssh root@${HOST_IP} "sh /root/workspace/scripts/disable_trace.sh" sudo ssh root@${HOST_IP} "cd /tmp ; mv trace.txt cyclictest_${env}.txt" mkdir -p $WORKSPACE/build_output/log/kernel_trace scp root@${HOST_IP}:/tmp/cyclictest_${env}.txt $WORKSPACE/build_output/log/kernel_trace/ @@ -189,15 +188,16 @@ 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" == "memorystress_idle" ];then - copyLogs - fi #Disabling ftrace after completion of executing test cases. if [ ${ftrace_enable} -eq '1' ]; then ftrace_disable fi + if [ "$testName" == "memorystress_idle" ];then + copyLogs + fi + #Verifying the results of cyclictest if [ "$testType" == "verify" ];then result=`grep -o '"errors":[^,]*' ${volume}/yardstick.out | awk -F '"' '{print $4}'` |