diff options
| -rwxr-xr-x | ci/cyclicTestTrigger.sh | 8 | ||||
| -rwxr-xr-x | ci/envs/cyclictest.sh | 2 | ||||
| -rwxr-xr-x | ci/test_kvmfornfv.sh | 2 | ||||
| -rw-r--r-- | tests/kvmfornfv_cyclictest_idle_idle.yaml | 51 |
4 files changed, 57 insertions, 6 deletions
diff --git a/ci/cyclicTestTrigger.sh b/ci/cyclicTestTrigger.sh index d8370fd71..6241452a2 100755 --- a/ci/cyclicTestTrigger.sh +++ b/ci/cyclicTestTrigger.sh @@ -29,12 +29,12 @@ function verifyGuestImage { fi } -#Updating the pod.yaml file with HOST_IP,cyclictest-node-context.yaml with loops and interval +#Updating the pod.yaml file with HOST_IP,kvmfornfv_cyclictest_idle_idle.yaml with loops and interval 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 "0,/interval: [0-9]*/s//interval: 1000/" cyclictest-node-context.yaml + sed -ri "s/loops: [0-9]*/loops: ${testTime}/" kvmfornfv_cyclictest_idle_idle.yaml + sed -ri "0,/interval: [0-9]*/s//interval: 1000/" kvmfornfv_cyclictest_idle_idle.yaml } #cleaning the environment after executing the test through yardstick. @@ -83,7 +83,7 @@ function runCyclicTest { #copying required files to run yardstick cyclic testcase mv $WORKSPACE/build_output/kernel-${KERNELRPM_VERSION}*.rpm ${volume}/rpm cp -r $WORKSPACE/ci/envs/* ${volume}/scripts - cp -r $WORKSPACE/tests/cyclictest-node-context.yaml ${volume} + cp -r $WORKSPACE/tests/kvmfornfv_cyclictest_idle_idle.yaml ${volume} cp -r $WORKSPACE/tests/pod.yaml ${volume}/scripts #Launching ubuntu docker container to run yardstick diff --git a/ci/envs/cyclictest.sh b/ci/envs/cyclictest.sh index c5b980d77..8f0993032 100755 --- a/ci/envs/cyclictest.sh +++ b/ci/envs/cyclictest.sh @@ -9,7 +9,7 @@ source utils.sh testType=$1 #daily/verify/merge HOST_IP=$( getHostIP ) pod_config='/opt/scripts/pod.yaml' -cyclictest_context_file='/opt/cyclictest-node-context.yaml' +cyclictest_context_file='/opt/kvmfornfv_cyclictest_idle_idle.yaml' if [ ! -f ${pod_config} ] ; then echo "file ${pod_config} not found" diff --git a/ci/test_kvmfornfv.sh b/ci/test_kvmfornfv.sh index c739e807e..e9f520059 100755 --- a/ci/test_kvmfornfv.sh +++ b/ci/test_kvmfornfv.sh @@ -31,7 +31,7 @@ if ! verifyGuestImage;then exit 1 fi -#Update cyclictest-node-context.yaml with test_time and pod.yaml with IP +#Update kvmfornfv_cyclictest_idle_idle.yaml with test_time and pod.yaml with IP updateYaml #Cleaning up the test environment before running cyclictest through yardstick. diff --git a/tests/kvmfornfv_cyclictest_idle_idle.yaml b/tests/kvmfornfv_cyclictest_idle_idle.yaml new file mode 100644 index 000000000..f3c84c856 --- /dev/null +++ b/tests/kvmfornfv_cyclictest_idle_idle.yaml @@ -0,0 +1,51 @@ +--- +# Sample benchmark task config file +# Measure system high resolution by using Cyclictest +# +# For this sample just like running the command below on the test vm and +# getting latencies info back to the yardstick. +# +# sudo bash cyclictest -a 1 -i 1000 -p 99 -l 1000 -t 1 -h 90 -m -n -q +# + +schema: "yardstick:task:0.1" + +scenarios: +- + type: Cyclictest + options: + affinity: 1 + interval: 1000 + priority: 99 + loops: 600000 + threads: 1 + histogram: 90 + host: kvm.LF + runner: + type: Duration + duration: 1 + interval: 1 + tc: "kvmfornfv_cyclictest-node-context" + sla: + max_min_latency: 50 + max_avg_latency: 100 + max_max_latency: 1000 + action: monitor + setup_options: + rpm_dir: "/opt/rpm" + script_dir: "/opt/scripts" + image_dir: "/opt/image" + host_setup_seqs: + - "host-setup0.sh" + - "reboot" + - "host-setup1.sh" + - "host-run-qemu.sh" + guest_setup_seqs: + - "guest-setup0.sh" + - "reboot" + - "guest-setup1.sh" + +context: + type: Node + name: LF + file: /opt/scripts/pod.yaml |