summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/Dockerfile2
-rw-r--r--docs/testing/user/userguide/04-installation.rst4
-rw-r--r--samples/ping-ext-ip.yaml2
-rw-r--r--samples/ping-ext-stimuli.yaml2
-rw-r--r--samples/ping-heat-context.yaml2
-rw-r--r--samples/ping-hot.yaml2
-rwxr-xr-xsamples/ping-iteration.yaml2
-rw-r--r--samples/ping-multiple-context.yaml4
-rw-r--r--samples/ping-multiple-vm.yaml2
-rw-r--r--samples/ping-option-list.yaml2
-rw-r--r--samples/ping-parallel.yaml2
-rw-r--r--samples/ping-serial.yaml2
-rw-r--r--samples/ping-template.yaml2
-rw-r--r--samples/ping.yaml2
-rw-r--r--samples/ping_bottlenecks.yaml2
-rw-r--r--samples/ping_load.yaml4
-rwxr-xr-xtests/ci/clean_images.sh2
-rwxr-xr-xtests/ci/load_images.sh6
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml2
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml4
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml4
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml4
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml4
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml4
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml4
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml4
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml4
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml4
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml4
29 files changed, 54 insertions, 34 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index a1b88fe69..248a6ab05 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -73,7 +73,7 @@ RUN ${YARDSTICK_REPO_DIR}/api/api-prepare.sh
EXPOSE 5000
-ADD http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img /home/opnfv/images/
+ADD http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img /home/opnfv/images/
ADD http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img /home/opnfv/images/
COPY ./exec_tests.sh /usr/local/bin/
diff --git a/docs/testing/user/userguide/04-installation.rst b/docs/testing/user/userguide/04-installation.rst
index c1db21220..64955c782 100644
--- a/docs/testing/user/userguide/04-installation.rst
+++ b/docs/testing/user/userguide/04-installation.rst
@@ -285,7 +285,7 @@ Example command:
--file /tmp/workspace/yardstick/yardstick-image.img
Some Yardstick test cases use a Cirros image and a Ubuntu 14.04 image, you can find one at
-http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img, https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img
+http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img, https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img
Add cirros and ubuntu image to OpenStack:
@@ -295,7 +295,7 @@ Add cirros and ubuntu image to OpenStack:
--disk-format qcow2 \
--container-format bare \
--file $cirros_image_file \
- cirros-0.3.3
+ cirros-0.3.5
openstack image create \
--disk-format qcow2 \
diff --git a/samples/ping-ext-ip.yaml b/samples/ping-ext-ip.yaml
index 86cb799cd..33dd18129 100644
--- a/samples/ping-ext-ip.yaml
+++ b/samples/ping-ext-ip.yaml
@@ -31,7 +31,7 @@ scenarios:
context:
name: demo
- image: cirros-0.3.3
+ image: cirros-0.3.5
flavor: yardstick-flavor
user: cirros
servers:
diff --git a/samples/ping-ext-stimuli.yaml b/samples/ping-ext-stimuli.yaml
index 5de528198..e0895f13e 100644
--- a/samples/ping-ext-stimuli.yaml
+++ b/samples/ping-ext-stimuli.yaml
@@ -44,7 +44,7 @@ scenarios:
context:
name: demo
- image: cirros-0.3.3
+ image: cirros-0.3.5
flavor: yardstick-flavor
user: cirros
servers:
diff --git a/samples/ping-heat-context.yaml b/samples/ping-heat-context.yaml
index dd22d58a7..db34ca08c 100644
--- a/samples/ping-heat-context.yaml
+++ b/samples/ping-heat-context.yaml
@@ -32,7 +32,7 @@ scenarios:
context:
type: Heat
name: demo
- image: cirros-0.3.3
+ image: cirros-0.3.5
flavor: yardstick-flavor
user: cirros
diff --git a/samples/ping-hot.yaml b/samples/ping-hot.yaml
index 418251809..c6366343c 100644
--- a/samples/ping-hot.yaml
+++ b/samples/ping-hot.yaml
@@ -40,7 +40,7 @@ context:
user: cirros
heat_template: /tmp/heat-templates/hot/servers_in_new_neutron_net.yaml
heat_parameters:
- image: cirros-0.3.3
+ image: cirros-0.3.5
flavor: yardstick-flavor
key_name: yardstick
public_net: "660fc7c3-7a56-4faf-91e5-3c9ebdda0104"
diff --git a/samples/ping-iteration.yaml b/samples/ping-iteration.yaml
index dea2396cf..bd3411989 100755
--- a/samples/ping-iteration.yaml
+++ b/samples/ping-iteration.yaml
@@ -31,7 +31,7 @@ scenarios:
context:
name: demo
- image: cirros-0.3.3
+ image: cirros-0.3.5
flavor: yardstick-flavor
user: cirros
diff --git a/samples/ping-multiple-context.yaml b/samples/ping-multiple-context.yaml
index 557b384f2..7180dae37 100644
--- a/samples/ping-multiple-context.yaml
+++ b/samples/ping-multiple-context.yaml
@@ -31,7 +31,7 @@ scenarios:
contexts:
-
name: demo1
- image: cirros-0.3.3
+ image: cirros-0.3.5
flavor: yardstick-flavor
user: cirros
placement_groups:
@@ -46,7 +46,7 @@ contexts:
cidr: '10.0.1.0/24'
-
name: demo2
- image: cirros-0.3.3
+ image: cirros-0.3.5
flavor: yardstick-flavor
user: cirros
placement_groups:
diff --git a/samples/ping-multiple-vm.yaml b/samples/ping-multiple-vm.yaml
index 993c82f49..7eae13004 100644
--- a/samples/ping-multiple-vm.yaml
+++ b/samples/ping-multiple-vm.yaml
@@ -35,7 +35,7 @@ scenarios:
context:
name: demo
- image: cirros-0.3.3
+ image: cirros-0.3.5
flavor: yardstick-flavor
user: cirros
diff --git a/samples/ping-option-list.yaml b/samples/ping-option-list.yaml
index fa81fdac2..844431962 100644
--- a/samples/ping-option-list.yaml
+++ b/samples/ping-option-list.yaml
@@ -29,7 +29,7 @@ scenarios:
context:
name: demo
- image: cirros-0.3.3
+ image: cirros-0.3.5
flavor: yardstick-flavor
user: cirros
diff --git a/samples/ping-parallel.yaml b/samples/ping-parallel.yaml
index 0da57ec19..8600cbb7f 100644
--- a/samples/ping-parallel.yaml
+++ b/samples/ping-parallel.yaml
@@ -43,7 +43,7 @@ scenarios:
context:
name: demo
- image: cirros-0.3.3
+ image: cirros-0.3.5
flavor: yardstick-flavor
user: cirros
diff --git a/samples/ping-serial.yaml b/samples/ping-serial.yaml
index ab06167c7..419c9459f 100644
--- a/samples/ping-serial.yaml
+++ b/samples/ping-serial.yaml
@@ -42,7 +42,7 @@ scenarios:
context:
name: demo
- image: cirros-0.3.3
+ image: cirros-0.3.5
flavor: yardstick-flavor
user: cirros
diff --git a/samples/ping-template.yaml b/samples/ping-template.yaml
index fabee07bd..a7327342c 100644
--- a/samples/ping-template.yaml
+++ b/samples/ping-template.yaml
@@ -36,7 +36,7 @@ scenarios:
context:
name: demo
- image: cirros-0.3.3
+ image: cirros-0.3.5
flavor: yardstick-flavor
user: cirros
diff --git a/samples/ping.yaml b/samples/ping.yaml
index b95c135eb..0c1783c0b 100644
--- a/samples/ping.yaml
+++ b/samples/ping.yaml
@@ -31,7 +31,7 @@ scenarios:
context:
name: demo
- image: cirros-0.3.3
+ image: cirros-0.3.5
flavor: yardstick-flavor
user: cirros
diff --git a/samples/ping_bottlenecks.yaml b/samples/ping_bottlenecks.yaml
index 910bcff73..01977a1de 100644
--- a/samples/ping_bottlenecks.yaml
+++ b/samples/ping_bottlenecks.yaml
@@ -34,7 +34,7 @@ contexts:
{% for num in range(stack_num) %}
-
name: demo{{num}}
- image: cirros-0.3.3
+ image: cirros-0.3.5
flavor: yardstick-flavor
user: cirros
diff --git a/samples/ping_load.yaml b/samples/ping_load.yaml
index 805ae8f27..2afb1310a 100644
--- a/samples/ping_load.yaml
+++ b/samples/ping_load.yaml
@@ -34,7 +34,7 @@ scenarios:
contexts:
-
name: demo1
- image: cirros-0.3.3
+ image: cirros-0.3.5
flavor: yardstick-flavor
user: cirros
@@ -58,7 +58,7 @@ contexts:
cidr: '10.0.1.0/24'
-
name: demo2
- image: cirros-0.3.3
+ image: cirros-0.3.5
flavor: yardstick-flavor
user: cirros
placement_groups:
diff --git a/tests/ci/clean_images.sh b/tests/ci/clean_images.sh
index 3579909c5..fcb2bf21f 100755
--- a/tests/ci/clean_images.sh
+++ b/tests/ci/clean_images.sh
@@ -19,7 +19,7 @@ cleanup()
return
fi
- for image in $(openstack image list | grep -e cirros-0.3.3 -e yardstick-image -e Ubuntu-14.04 \
+ for image in $(openstack image list | grep -e cirros-0.3.5 -e yardstick-image -e Ubuntu-14.04 \
| awk '{print $2}'); do
echo "Deleting image $image..."
openstack image delete $image || true
diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh
index a326458a9..16395cb0a 100755
--- a/tests/ci/load_images.sh
+++ b/tests/ci/load_images.sh
@@ -155,7 +155,7 @@ load_cirros_image()
echo
echo "========== Loading cirros cloud image =========="
- local image_file=/home/opnfv/images/cirros-0.3.3-x86_64-disk.img
+ local image_file=/home/opnfv/images/cirros-0.3.5-x86_64-disk.img
EXTRA_PARAMS=""
# VPP requires guest memory to be backed by large pages
@@ -168,7 +168,7 @@ load_cirros_image()
--container-format bare \
${EXTRA_PARAMS} \
--file ${image_file} \
- cirros-0.3.3)
+ cirros-0.3.5)
echo "$output"
CIRROS_IMAGE_ID=$(echo "$output" | grep " id " | awk '{print $(NF-1)}')
@@ -238,7 +238,7 @@ main()
load_yardstick_image
if [ "${YARD_IMG_ARCH}" == "arm64" ]; then
sed -i 's/image: {{image}}/image: TestVM/g' tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml
- sed -i 's/image: cirros-0.3.3/image: TestVM/g' samples/ping.yaml
+ sed -i 's/image: cirros-0.3.5/image: TestVM/g' samples/ping.yaml
#We have overlapping IP with the real network
for filename in tests/opnfv/test_cases/*; do
sed -i "s/cidr: '10.0.1.0\/24'/cidr: '10.3.1.0\/24'/g" "${filename}"
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml
index 21aa3ee7b..1de573d83 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml
@@ -13,7 +13,7 @@ description: >
Yardstick TC002 config file;
measure network latency using ping;
-{% set image = image or "cirros-0.3.3" %}
+{% set image = image or "cirros-0.3.5" %}
scenarios:
{% for i in range(2) %}
-
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml
index 246967541..cad6c591c 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml
@@ -12,6 +12,8 @@ schema: "yardstick:task:0.1"
description: >
Test case for TC045 :Control node Openstack service down - neutron server.
+{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+
scenarios:
-
type: ServiceHA
@@ -48,5 +50,5 @@ scenarios:
context:
type: Node
name: LF
- file: etc/yardstick/nodes/fuel_virtual/pod.yaml
+ file: {{file}}
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml
index 397d05133..38b475451 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml
@@ -12,6 +12,8 @@ schema: "yardstick:task:0.1"
description: >
Test case for TC046 :Control node Openstack service down - keystone.
+{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+
scenarios:
-
type: ServiceHA
@@ -48,4 +50,4 @@ scenarios:
context:
type: Node
name: LF
- file: etc/yardstick/nodes/fuel_virtual/pod.yaml
+ file: {{file}}
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml
index ffae96b88..53df7c64b 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml
@@ -12,6 +12,8 @@ schema: "yardstick:task:0.1"
description: >
Test case for TC047 :Control node Openstack service down - glance api.
+{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+
scenarios:
-
type: ServiceHA
@@ -48,4 +50,4 @@ scenarios:
context:
type: Node
name: LF
- file: etc/yardstick/nodes/fuel_virtual/pod.yaml
+ file: {{file}}
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml
index 7ebca4d99..7457f9392 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml
@@ -12,6 +12,8 @@ schema: "yardstick:task:0.1"
description: >
Test case for TC048 :Control node Openstack service down - cinder api.
+{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+
scenarios:
-
type: ServiceHA
@@ -48,5 +50,5 @@ scenarios:
context:
type: Node
name: LF
- file: etc/yardstick/nodes/fuel_virtual/pod.yaml
+ file: {{file}}
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml
index 679e78265..e55345ae2 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml
@@ -12,6 +12,8 @@ schema: "yardstick:task:0.1"
description: >
Test case for TC049 :Control node Openstack service down - swift proxy.
+{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+
scenarios:
-
type: ServiceHA
@@ -48,4 +50,4 @@ scenarios:
context:
type: Node
name: LF
- file: etc/yardstick/nodes/fuel_virtual/pod.yaml
+ file: {{file}}
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml
index 4bb995036..b1dc31e90 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml
@@ -13,6 +13,8 @@ description: >
Test case for TC050 :OpenStack Controller Node Network High Availability;
This test case is written by new scenario-based HA testing framework.
+{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+
scenarios:
-
type: "GeneralHA"
@@ -146,4 +148,4 @@ scenarios:
context:
type: Node
name: LF
- file: etc/yardstick/nodes/fuel_virtual/pod.yaml
+ file: {{file}}
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml
index e8cc81745..cf2b51548 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml
@@ -13,6 +13,8 @@ description: >
Test case for TC051 :OpenStack Controller Node CPU Overload High Availability;
This test case is written by new scenario-based HA testing framework.
+{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+
scenarios:
-
type: "GeneralHA"
@@ -97,4 +99,4 @@ scenarios:
context:
type: Node
name: LF
- file: etc/yardstick/nodes/fuel_virtual/pod.yaml
+ file: {{file}}
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml
index a95e5415b..6e060b15d 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml
@@ -13,6 +13,8 @@ description: >
Test case for TC052 :OpenStack Controller Node Disk I/O Block High Availability;
This test case is written by new scenario-based HA testing framework.
+{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+
scenarios:
-
type: "GeneralHA"
@@ -86,4 +88,4 @@ scenarios:
context:
type: Node
name: LF
- file: etc/yardstick/nodes/fuel_virtual/pod.yaml
+ file: {{file}}
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml
index ff479f9e1..b6bbb8966 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml
@@ -13,6 +13,8 @@ description: >
Test case for TC053 :Openstack Controller Load Balance Service High Availability;
This test case is written by new scenario-based HA testing framework.
+{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+
scenarios:
-
type: "GeneralHA"
@@ -68,4 +70,4 @@ scenarios:
context:
type: Node
name: LF
- file: etc/yardstick/nodes/fuel_virtual/pod.yaml
+ file: {{file}}
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
index c87d3b9fe..2d51a96cc 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
@@ -13,6 +13,8 @@ description: >
Test case for TC054 :OpenStack VIP Master Node abnormally shutdown High Availability;
This test case is written by new scenario-based HA testing framework.
+{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+
scenarios:
-
type: "GeneralHA"
@@ -120,4 +122,4 @@ scenarios:
context:
type: Node
name: LF
- file: etc/yardstick/nodes/fuel_virtual/pod.yaml
+ file: {{file}}