X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fenvs%2Fhost-config;h=c656f839b1f3eb7936d98077fba78c64fed38f78;hb=HEAD;hp=99cbb3773ef7d1d25652e7e2367b2e890c360b1e;hpb=0666e6b9c92cdba1d90c951423e5ef1fb2736c48;p=kvmfornfv.git

diff --git a/ci/envs/host-config b/ci/envs/host-config
index 99cbb3773..c656f839b 100755
--- a/ci/envs/host-config
+++ b/ci/envs/host-config
@@ -21,7 +21,7 @@ pcm_memory=/root/pcm/pcm-memory.x
 # Isolated cpus for nfv, must be given as a range '-' and Numa node1 CPU's should be considered
 host_isolcpus=`lscpu | grep "NUMA node1 CPU(s)"| awk -F ':' '{print \$2}' | sed 's/[[:space:]]//g'`
 first=$(echo ${host_isolcpus} | cut -f1 -d-)
-last=$(echo ${host_isolcpus} | cut -f2 -d-)
+last=$(echo ${host_isolcpus} | cut -f2 -d- | cut -d',' -f1 )
 
 # Bind cpus from host_isolcpus range for QEMU processor threads
 i=0
@@ -35,12 +35,45 @@ done
 stress_isolcpus=${first}-${last}
 echo "Stress tool runs on $stress_isolcpus"
 
-#Tar the log files generated during testcase execution.
-function err_exit {
+#Host for executing test cases based on test_type/job from releng
+function setHostIP {
+   test_type=$1
+   if [ ${test_type} == "verify" ];then
+      HOST_IP="10.10.100.21"
+   elif [ ${test_type} == "daily" ];then
+      HOST_IP="10.10.100.22"
+   else
+      echo "Incorrect test type"
+   fi
+   echo ${HOST_IP}
+}
+
+#Time duration for executing test cases based on test_type/job from releng
+function setTestTime {
+   test_type=$1
+   if [ ${test_type} == "verify" ];then
+      test_time=120000 # 2m
+   elif [ ${test_type} == "daily" ];then
+      test_time=3600000 # 1hr
+   else
+      echo "Incorrect test type"
+   fi
+   echo ${test_time}
+}
+
+#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
 }
@@ -55,3 +88,24 @@ function copyLogs {
    sudo ssh root@${HOST_IP} "cd /root;rm -rf MBWInfo MBWInfo.tar.gz"
 }
 
+function packet_fwd_logs {
+   #Tar and copy logs for uploading to artifacts repository
+   echo "Copying Log files from Node to Jump Server"
+   mkdir -p $WORKSPACE/build_output/log/packet_fwd
+   scp -r root@${HOST_IP}:/tmp/packet_fwd_logs $WORKSPACE/build_output/log/packet_fwd
+   #removing collected logs on the node after copying.
+   sudo ssh root@${HOST_IP} "cd /tmp;rm -rf packet_fwd_logs"
+}
+
+function packet_fwd_exit {
+   exitCode=$1
+   TIMESTAMP=$(date -u +"%Y-%m-%d_%H-%M-%S")
+   cd $WORKSPACE/build_output/
+   if [ -d log ];then
+      tar -czvf log-${TIMESTAMP}.tar.gz log
+      echo "Uploading packet forwarding logs and results"
+      gsutil cp -r log-*.tar.gz gs://artifacts.opnfv.org/kvmfornfv/packet_fwd_${TIMESTAMP} > $WORKSPACE/build_output/gsutil.log 2>&1
+      echo "http://artifacts.opnfv.org/kvmfornfv/packet_fwd_${TIMESTAMP}"
+   fi
+   exit $exitCode
+}