summaryrefslogtreecommitdiffstats
path: root/ci/envs
diff options
context:
space:
mode:
authorJiang, Yunhong <yunhong.jiang@intel.com>2016-08-20 20:09:20 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-20 20:09:20 +0000
commit42e2343970d47d0aa081a565c0f51873778e555c (patch)
tree906331bf89ee8fee2c4bd156abd05a0bc7f53353 /ci/envs
parent1ec14a31c3ee8df1b8602632e0e3295547e3ea12 (diff)
parent98ac1e06204a5cb5f9ab1158173232e31772359f (diff)
Merge "CI integration for KVMforNFV."
Diffstat (limited to 'ci/envs')
-rwxr-xr-x[-rw-r--r--]ci/envs/cyclictest.sh8
-rwxr-xr-xci/envs/guest-setup0.sh19
-rwxr-xr-xci/envs/host-run-qemu.sh22
-rwxr-xr-xci/envs/host-setup0.sh2
4 files changed, 30 insertions, 21 deletions
diff --git a/ci/envs/cyclictest.sh b/ci/envs/cyclictest.sh
index e4dd9931f..c261fe05d 100644..100755
--- a/ci/envs/cyclictest.sh
+++ b/ci/envs/cyclictest.sh
@@ -18,6 +18,10 @@ if [ ! -f ${cyclictest_context_file} ] ; then
exit 1
fi
+#setting up of image for launching guest vm.
+sudo ssh root@10.2.117.23 "cp /root/images/guest1.qcow2 /root/"
+
#Running cyclictest through yardstick
-yardstick task start ${cyclictest_context_file}
-mv /tmp/yardstick.out /opt/
+yardstick -d task start ${cyclictest_context_file}
+chmod 777 /tmp/yardstick.out
+cat /tmp/yardstick.out > /opt/yardstick.out
diff --git a/ci/envs/guest-setup0.sh b/ci/envs/guest-setup0.sh
index 490bd570d..4f9eaa430 100755
--- a/ci/envs/guest-setup0.sh
+++ b/ci/envs/guest-setup0.sh
@@ -9,27 +9,26 @@
###############################################################################
-rpmdir=${1:-"/root/workspace/"}
-rpmpat="kernel-4.1*.rpm"
-rpm -ihv ${rpmdir}/rt-tests-0.96-1.el7.centos.x86_64.rpm
+rpmdir=${1:-"/root/workspace/rpm"}
+rpmpat="kernel-4.4*.rpm"
guest_isolcpus=1
-# The script's caller should passing the rpm directory that is built out from
+# The script's caller should passing the rpm directory that is built out from
# build.sh. The default rpmdir is the one used by yardstick scripts.
install_kernel () {
# Install the kernel rpm
filenum=`ls -l ${rpmdir}/${rpmpat} |wc -l`
if [ $filenum -eq 0 ]
then
- echo "No kernel rpm found in workspace/rpm"
- exit 1
+ echo "No kernel rpm found in workspace/rpm"
+ exit 1
elif [ $filenum -gt 1 ]
then
- echo "Multiple kernel rpm found in workspace/rpm"
- exit 1
+ echo "Multiple kernel rpm found in workspace/rpm"
+ exit 1
else
- krpm=`find "${rpmdir}" -name "${rpmpat}"`
- rpm -ihv $krpm
+ krpm=`find "${rpmdir}" -name "${rpmpat}"`
+ rpm -ihv $krpm
fi
}
diff --git a/ci/envs/host-run-qemu.sh b/ci/envs/host-run-qemu.sh
index c7a2fecc6..487aebe66 100755
--- a/ci/envs/host-run-qemu.sh
+++ b/ci/envs/host-run-qemu.sh
@@ -18,14 +18,20 @@ cpumask () {
qmp_sock="/tmp/qmp-sock-$$"
-${qemu} -smp ${guest_cpus} -monitor unix:${qmp_sock},server,nowait -daemonize \
- -cpu host,migratable=off,+invtsc,+tsc-deadline,pmu=off \
- -realtime mlock=on -mem-prealloc -enable-kvm -m 1G \
- -mem-path /mnt/hugetlbfs-1g \
- -drive file=/root/workspace/image/guest.img,cache=none,aio=threads \
- -netdev user,id=guest0,hostfwd=tcp::5555-:22 \
- -device virtio-net-pci,netdev=guest0 \
- -nographic -serial /dev/null -parallel /dev/null
+#${qemu} -smp ${guest_cpus} -monitor unix:${qmp_sock},server,nowait -daemonize \
+# -cpu host,migratable=off,+invtsc,+tsc-deadline,pmu=off \
+# -realtime mlock=on -mem-prealloc -enable-kvm -m 1G \
+# -mem-path /mnt/hugetlbfs-1g \
+# -drive file=/root/minimal-centos1.qcow2,cache=none,aio=threads \
+# -netdev user,id=guest0,hostfwd=tcp:10.2.117.23:5555-:22 \
+# -device virtio-net-pci,netdev=guest0 \
+# -nographic -serial /dev/null -parallel /dev/null
+
+${qemu} -smp ${guest_cpus} -drive file=/root/guest1.qcow2 -daemonize \
+ -netdev user,id=net0,hostfwd=tcp:10.2.117.23:5555-:22 \
+ -realtime mlock=on -mem-prealloc -enable-kvm -m 1G \
+ -mem-path /mnt/hugetlbfs-1g \
+ -device virtio-net-pci,netdev=net0 \
i=0
for c in `echo ${host_isolcpus} | sed 's/,/ /g'` ; do
diff --git a/ci/envs/host-setup0.sh b/ci/envs/host-setup0.sh
index 79d1f585a..28c49b8b8 100755
--- a/ci/envs/host-setup0.sh
+++ b/ci/envs/host-setup0.sh
@@ -12,7 +12,7 @@
source host-config
rpmdir=${1:-"/root/workspace/rpm/"}
-rpmpat="kernel-4.1*.rpm"
+rpmpat="kernel-4.4*.rpm"
config_grub () {
key=$1