Merge "This patch includes updated scripts to enable ftrace and collect logs for...

diff --git a/ci/apex_build.sh b/ci/apex_build.sh
index 5b81840..8e57ac8 100755 (executable)
--- 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 e696fcd..4a5d1b5 100755 (executable)
--- 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 5e4f1c4..c2c0f85 100755 (executable)
--- 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

diff --git a/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp b/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp
index fba3e38..0ca9a8d 100644 (file)
--- a/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp
+++ b/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp
@@ -2,7 +2,7 @@ $kvm_settings = hiera('fuel-plugin-kvm')
 
 case $::operatingsystem {
   'Ubuntu': {
-    $version         = '4.4.6-rt14nfv'
+    $version         = '4.4.50-rt62nfv'
     $kernel_kit      = ["linux-headers-${version}", "linux-image-${version}"]
     $kernel_src      = "/usr/src/linux-headers-${version}"
     $kernel_src_link = "/lib/modules/${version}/build"