summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorJiang, Yunhong <yunhong.jiang@intel.com>2017-05-18 16:34:00 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-05-18 16:34:00 +0000
commitc4d68bc45aa6aa8b7fe39bce206cb17c2cb2d365 (patch)
treec5967a40da2a377d6d277f8abb19a0ddbae4b0f2 /ci
parentf894c01f90dd0d1813e8f32217cc0309ee5db219 (diff)
parent156570aeb2bd567890da31e4efecbe48d7129b8b (diff)
Merge "Optimizing the code and uploading ftrace logs to artifacts"
Diffstat (limited to 'ci')
-rwxr-xr-xci/cyclicTestTrigger.sh8
-rwxr-xr-xci/envs/host-config9
-rwxr-xr-xci/test_kvmfornfv.sh2
3 files changed, 12 insertions, 7 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}'`
diff --git a/ci/envs/host-config b/ci/envs/host-config
index 54d262af4..c656f839b 100755
--- a/ci/envs/host-config
+++ b/ci/envs/host-config
@@ -64,9 +64,16 @@ function setTestTime {
#Tar the log files generated during testcase execution and exit.
function test_exit {
exitCode=$1
+ time_stamp=$(date -u +"%Y-%m-%d_%H-%M-%S")
cd $WORKSPACE/build_output/
if [ -d log ];then
- tar -czvf log-$(date -u +"%Y-%m-%d_%H-%M-%S").tar.gz log
+ tar -czvf log-${time_stamp}.tar.gz log
+ echo "uploading debugging logs to artifacts"
+ gsutil cp -r log-*.tar.gz gs://artifacts.opnfv.org/kvmfornfv/\
+ kvmfornfv_verify_debug_logs_${time_stamp} > \
+ $WORKSPACE/build_output/gsutil.log 2>&1
+ echo -e "Download the logs from artifacts using below for debugging\n
+ http://artifacts.opnfv.org/kvmfornfv/kvmfornfv_verify_debug_logs_${time_stamp}"
fi
exit $exitCode
}
diff --git a/ci/test_kvmfornfv.sh b/ci/test_kvmfornfv.sh
index b1aa97390..5d886dedc 100755
--- a/ci/test_kvmfornfv.sh
+++ b/ci/test_kvmfornfv.sh
@@ -165,8 +165,6 @@ elif [ ${test_type} == "daily" ];then
sed -i '/host-setup1.sh/a\ \- \"enable-trace.sh\"' kvmfornfv_cyclictest_hostenv_guestenv.yaml
#Executing cyclictest through yardstick.
cyclictest ${env}
- #disabling ftrace and collecting the logs to upload to artifact repository.
- ftrace_disable
sleep 5
done
else