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

diff --git a/ci/envs/host-config b/ci/envs/host-config
old mode 100644
new mode 100755
index ce6243ce0..99cbb3773
--- a/ci/envs/host-config
+++ b/ci/envs/host-config
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 ##############################################################################
 ## Copyright (c) 2015 Intel Corp.
 ##
@@ -7,13 +9,49 @@
 ## http://www.apache.org/licenses/LICENSE-2.0
 ###############################################################################
 
-# Isolated cpus for nfv, must be delimited with ','
-host_isolcpus=3,4
-
 # Number of huge pages to create and on which NUMA node
-numa_node=0
+numa_node=1
 huge_pages=2
 
 # QEMU executable path and number of cpus for guest
-qemu=/usr/libexec/qemu-kvm
+qemu=/usr/local/bin/qemu-system-x86_64
 guest_cpus=2
+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-)
+
+# Bind cpus from host_isolcpus range for QEMU processor threads
+i=0
+while [ ${i} -lt ${guest_cpus} ]; do
+ qemu_cpu[$i]=${first}
+ i=`expr $i + 1`
+ first=`expr $first + 1`
+done
+
+#Isolated cpus from host_isolcpus range to run Stress tool
+stress_isolcpus=${first}-${last}
+echo "Stress tool runs on $stress_isolcpus"
+
+#Tar the log files generated during testcase execution.
+function err_exit {
+   exitCode=$1
+   cd $WORKSPACE/build_output/
+   if [ -d log ];then
+      tar -czvf log-$(date -u +"%Y-%m-%d_%H-%M-%S").tar.gz log
+   fi
+   exit $exitCode
+}
+
+function copyLogs {
+   echo "Copying Log files from Node to Jump Server"
+   sudo ssh root@${HOST_IP} "cd /root;tar -czvf MBWInfo.tar.gz MBWInfo"
+   mkdir -p $WORKSPACE/build_output/log/MBWInfo
+   scp root@${HOST_IP}:/root/MBWInfo.tar.gz $WORKSPACE/build_output/log/MBWInfo
+   echo "Listing all the logs collected"
+   cd $WORKSPACE;ls build_output/log/MBWInfo;
+   sudo ssh root@${HOST_IP} "cd /root;rm -rf MBWInfo MBWInfo.tar.gz"
+}
+