summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorJiang, Yunhong <yunhong.jiang@intel.com>2016-10-14 16:49:04 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-10-14 16:49:04 +0000
commit2966c910ccaaa11e69ccfc08d6185c3520a2e8cb (patch)
tree3aca15c9def3e4e43467c3743728f1b67c7b2fba /ci
parent15f48a2a1322a8dae448031ea2372d05dbf84731 (diff)
parent8131fe4accd335eb9b15ca0dd4a2e4a776ab9727 (diff)
Merge "This patch contains scripts to decrease the time taken for the execution of cyclictest through yardstick."
Diffstat (limited to 'ci')
-rwxr-xr-xci/cyclicTestTrigger.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/ci/cyclicTestTrigger.sh b/ci/cyclicTestTrigger.sh
index 0e9d04a54..d8370fd71 100755
--- a/ci/cyclicTestTrigger.sh
+++ b/ci/cyclicTestTrigger.sh
@@ -34,12 +34,13 @@ function updateYaml {
cd $WORKSPACE/tests/
sed -ri "s/[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/${HOST_IP}/" pod.yaml
sed -ri "s/loops: [0-9]*/loops: ${testTime}/" cyclictest-node-context.yaml
- sed -ri "s/interval: [0-9]*/interval: 1000/" cyclictest-node-context.yaml
+ sed -ri "0,/interval: [0-9]*/s//interval: 1000/" cyclictest-node-context.yaml
}
#cleaning the environment after executing the test through yardstick.
function env_clean {
container_id=`sudo docker ps -a | grep kvmfornfv_${testType} |awk '{print \$1}'|sed -e 's/\r//g'`
+ sudo docker stop ${container_id}
sudo docker rm ${container_id}
sudo ssh root@${HOST_IP} "rm -rf /root/workspace/*"
sudo ssh root@${HOST_IP} "pid=\$(ps aux | grep 'qemu' | awk '{print \$2}' | head -1); echo \$pid |xargs kill"