diff options
author | shravani <shravani.p@tcs.com> | 2016-09-13 15:23:09 +0530 |
---|---|---|
committer | shravani <shravani.p@tcs.com> | 2016-09-13 15:45:36 +0530 |
commit | b8f6485d5a5c66f0fce566e59b8b5891c6a7f571 (patch) | |
tree | c656ae6a20273c6c6a9e080f894e89043ab2e44d /ci/envs | |
parent | 7209c685c8bea4ed6cc2f388ef0a65f1fac5b3ed (diff) |
Execution of kvm4nfv cyclictest based on job type.
This patch contains the updated test scripts which
will select the node and test run time for performing
cyclictest case based on the job type.
Change-Id: Ia54e98faac2f5da956688f1ca57664cea1151d84
Signed-off-by: Shravani <shravani.p@tcs.com>
Diffstat (limited to 'ci/envs')
-rwxr-xr-x | ci/envs/cyclictest.sh | 4 | ||||
-rwxr-xr-x | ci/envs/host-run-qemu.sh | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ci/envs/cyclictest.sh b/ci/envs/cyclictest.sh index c261fe05d..747f34758 100755 --- a/ci/envs/cyclictest.sh +++ b/ci/envs/cyclictest.sh @@ -4,7 +4,9 @@ ## Invoking this script from ubuntu docker container runs ## cyclictest through yardstick ########################################################### +source utils.sh +HOST_IP=$( getHostIP ) pod_config='/opt/pod.yaml' cyclictest_context_file='/opt/cyclictest-node-context.yaml' @@ -19,7 +21,7 @@ if [ ! -f ${cyclictest_context_file} ] ; then fi #setting up of image for launching guest vm. -sudo ssh root@10.2.117.23 "cp /root/images/guest1.qcow2 /root/" +sudo ssh root@$HOST_IP "cp /root/images/guest1.qcow2 /root/" #Running cyclictest through yardstick yardstick -d task start ${cyclictest_context_file} diff --git a/ci/envs/host-run-qemu.sh b/ci/envs/host-run-qemu.sh index 487aebe66..400e9e306 100755 --- a/ci/envs/host-run-qemu.sh +++ b/ci/envs/host-run-qemu.sh @@ -9,8 +9,11 @@ ## http://www.apache.org/licenses/LICENSE-2.0 ############################################################################### +source utils.sh source host-config +HOST_IP=$( getHostIP ) + cpumask () { m=$((1<<${1})) printf 0x%x ${m} @@ -28,7 +31,7 @@ qmp_sock="/tmp/qmp-sock-$$" # -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 \ + -netdev user,id=net0,hostfwd=tcp:$HOST_IP:5555-:22 \ -realtime mlock=on -mem-prealloc -enable-kvm -m 1G \ -mem-path /mnt/hugetlbfs-1g \ -device virtio-net-pci,netdev=net0 \ |