From 4962e21772b61aeeaa98c3516efe89cfc609a4f6 Mon Sep 17 00:00:00 2001 From: rexlee8776 Date: Thu, 12 Jul 2018 12:37:38 +0000 Subject: Create a sample lmbench test case base on kubernetes make samples/lmbench.yaml to support both Openstack and K8s with context_type specified. It defaultly use Heat context, if for k8s, yardstick -d task start samples/lmbench.yaml --task-args '{"context_type": "Kubernetes"}' JIRA: YARDSTICK-1310 Change-Id: Ifa542e830fb5ab7823bd4f994ab5d7a8e8a5b415 Signed-off-by: rexlee8776 --- samples/lmbench.yaml | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/samples/lmbench.yaml b/samples/lmbench.yaml index ea2966b24..7050243f9 100644 --- a/samples/lmbench.yaml +++ b/samples/lmbench.yaml @@ -9,6 +9,13 @@ --- # Sample benchmark task config file # measure memory read latency and memory bandwidth using lmbench +# can be used both on Openstack and Kubernetes with "context_type" + +{% set context_type = context_type or "Heat" %} +{% set separator = separator or "." %} +{% if context_type == "Kubernetes" %} +{% set separator = "-" %} +{% endif %} schema: "yardstick:task:0.1" @@ -19,7 +26,7 @@ scenarios: test_type: "latency" stop_size: 32.0 - host: demeter.demo + host: demeter{{ separator }}demo runner: type: Arithmetic @@ -39,7 +46,7 @@ scenarios: test_type: "bandwidth" benchmark: "wr" - host: demeter.demo + host: demeter{{ separator }}demo runner: type: Arithmetic @@ -55,7 +62,24 @@ scenarios: action: monitor context: + type: {{ context_type }} name: demo + {% if context_type == "Kubernetes" %} + servers: + demeter: + image: opnfv/yardstick-image-k8s + resources: + limits: + cpu: 1 + memory: 1Gi + requests: + cpu: 1 + memory: 1Gi + command: /bin/bash + args: ['-c', 'mkdir /root/.ssh; cp /tmp/.ssh/authorized_keys ~/.ssh/.; + chmod 700 ~/.ssh; chmod 600 ~/.ssh/*; service ssh restart; + while true ; do sleep 10000; done'] + {% else %} image: yardstick-image flavor: yardstick-flavor user: ubuntu @@ -71,6 +95,5 @@ context: networks: test: - cidr: '10.0.1.0/24' - - + cidr: "10.0.1.0/24" + {% endif %} -- cgit 1.2.3-korg