From: Jiang, Yunhong <yunhong.jiang@intel.com>
Date: Sat, 11 Mar 2017 01:25:35 +0000 (+0000)
Subject: Merge "This patch includes building of the kernel rpm's for the commit id  provided... 
X-Git-Tag: opnfv-5.0.0~54
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0666e6b9c92cdba1d90c951423e5ef1fb2736c48;hp=-c;p=kvmfornfv.git

Merge "This patch includes building of the kernel rpm's for the commit id  provided in apex.conf file and renaming of the kernel rpm's in the format  kvmfornfv-commitid-apex-kernel-[devel/header]-4.4.6_rt14_centos.x86_64.rpm"
---

0666e6b9c92cdba1d90c951423e5ef1fb2736c48
diff --combined ci/cyclicTestTrigger.sh
index 14aafbe98,4315aab5c..43d2d6ac5
--- a/ci/cyclicTestTrigger.sh
+++ b/ci/cyclicTestTrigger.sh
@@@ -14,6 -14,9 +14,9 @@@ testName=$
  
  source $WORKSPACE/ci/envs/utils.sh
  source $WORKSPACE/ci/envs/host-config
+ 
+ checkRPMNames
+ 
  KERNELRPM_VERSION=$( getKernelVersion )
  QEMURPM_VERSION=$( getQemuVersion )
  
@@@ -151,10 -154,8 +154,10 @@@ 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" == "iostress_idle" ];then
 +      copyLogs
 +   fi
     #Verifying the results of cyclictest
 -
     if [ "$testType" == "verify" ];then
        result=`grep -o '"errors":[^,]*' ${volume}/yardstick.out | awk -F '"' '{print $4}'`