From: RajithaY <rajithax.yerrumsetty@intel.com>
Date: Mon, 20 Mar 2017 09:45:28 +0000 (+0530)
Subject: This patch contains the code changes to check the commit id in
X-Git-Tag: opnfv-5.0.0~49
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=kvmfornfv.git;a=commitdiff_plain;h=c3893858bf09f4cca8850fb9b0f59f1a050f6b38

This patch contains the code changes to check the commit id in
the apex.conf file is valid or not and to update the
stress_isolcpus to 22-43 on console

Change-Id: I6a2e78f51f2371042bcbfa4f8c3e31b316938528
Signed-off-by:RajithaY<rajithax.yerrumsetty@intel.com>
---

diff --git a/ci/apex_build.sh b/ci/apex_build.sh
index 5b8184076..8e57ac847 100755
--- a/ci/apex_build.sh
+++ b/ci/apex_build.sh
@@ -12,6 +12,10 @@ if [ "$branch" == "master" ] || [ "$branch" == "danube" ];then
    echo "Checking out on $branch branch"
    echo "Commit-id is ${commit_id}"
    git checkout -f ${commit_id}
+   if [ $? -ne 0 ];then
+      echo "Please check the commit-id provided in apex.conf"
+      exit 1
+   fi
 fi
 mkdir ${output_dir}
 }
diff --git a/ci/envs/host-config b/ci/envs/host-config
index e696fcde1..4a5d1b5a2 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
diff --git a/ci/envs/utils.sh b/ci/envs/utils.sh
index 5e4f1c470..c2c0f85a6 100755
--- a/ci/envs/utils.sh
+++ b/ci/envs/utils.sh
@@ -43,7 +43,7 @@ function getQemuVersion {
 function checkRPMNames {
   rpm_dir="/root/workspace/rpm"
   if [ -d "$WORKSPACE" ];then
-     cd $WORKSPACE/build_output 2>/dev/null;RPMCOUNT=`ls kvmfornfv-* | wc -l`
+     cd $WORKSPACE/build_output 2>/dev/null;RPMCOUNT=`ls kvmfornfv-* 2>/dev/null | wc -l`
         if [ $RPMCOUNT -ne 0 ];then
            echo "Testcases are not executed for apex_build"
            exit 0