From b237b762bbb1c9cb1a05fc46a1a67ae557791e77 Mon Sep 17 00:00:00 2001 From: Rodolfo Alonso Hernandez Date: Wed, 29 Nov 2017 16:21:12 +0000 Subject: Change testcases 'cirros' image to 'yardstick-image' The default OpenStack 'cirros-0.3.5' image doesn't exist anymore. The image included by default in any testing OpenStack deployment is now called 'cirros-0.3.5-x86_64-disk', but this name can change. Because Yardstick, during the installation, deploys a customized image, 'yardstick-image', it makes sense to use it as the default image. JIRA: YARDSTICK-873 Change-Id: I8fd7cbc01d4fa52e9107f2fac7d2d9ff5d1091c7 Signed-off-by: Rodolfo Alonso Hernandez --- docs/testing/developer/devguide/devguide.rst | 4 ++-- samples/ping-ext-ip.yaml | 4 ++-- samples/ping-ext-stimuli.yaml | 4 ++-- samples/ping-heat-context.yaml | 4 ++-- samples/ping-hot.yaml | 2 +- samples/ping-iteration.yaml | 4 ++-- samples/ping-multiple-context.yaml | 8 ++++---- samples/ping-multiple-vm.yaml | 4 ++-- samples/ping-option-list.yaml | 4 ++-- samples/ping-parallel.yaml | 4 ++-- samples/ping-serial.yaml | 4 ++-- samples/ping-template.yaml | 4 ++-- samples/ping.yaml | 4 ++-- samples/ping_bottlenecks.yaml | 4 ++-- samples/ping_load.yaml | 8 ++++---- tests/opnfv/test_cases/opnfv_yardstick_tc081.yaml | 4 ++-- 16 files changed, 35 insertions(+), 35 deletions(-) diff --git a/docs/testing/developer/devguide/devguide.rst b/docs/testing/developer/devguide/devguide.rst index 4f69456fc..1d47e5605 100755 --- a/docs/testing/developer/devguide/devguide.rst +++ b/docs/testing/developer/devguide/devguide.rst @@ -123,9 +123,9 @@ In this Yaml file, you can easily find it consists of two sections. One is “Sc context: name: demo - image: cirros-0.3.5 + image: yardstick-image flavor: yardstick-flavor - user: cirros + user: ubuntu placement_groups: pgrp1: diff --git a/samples/ping-ext-ip.yaml b/samples/ping-ext-ip.yaml index 33dd18129..bbba22c0f 100644 --- a/samples/ping-ext-ip.yaml +++ b/samples/ping-ext-ip.yaml @@ -31,9 +31,9 @@ scenarios: context: name: demo - image: cirros-0.3.5 + image: yardstick-image flavor: yardstick-flavor - user: cirros + user: ubuntu servers: hermes: floating_ip: true diff --git a/samples/ping-ext-stimuli.yaml b/samples/ping-ext-stimuli.yaml index e0895f13e..bac9e085b 100644 --- a/samples/ping-ext-stimuli.yaml +++ b/samples/ping-ext-stimuli.yaml @@ -44,9 +44,9 @@ scenarios: context: name: demo - image: cirros-0.3.5 + image: yardstick-image flavor: yardstick-flavor - user: cirros + user: ubuntu servers: goofy: floating_ip: true diff --git a/samples/ping-heat-context.yaml b/samples/ping-heat-context.yaml index db34ca08c..866ffbf78 100644 --- a/samples/ping-heat-context.yaml +++ b/samples/ping-heat-context.yaml @@ -32,9 +32,9 @@ scenarios: context: type: Heat name: demo - image: cirros-0.3.5 + image: yardstick-image flavor: yardstick-flavor - user: cirros + user: ubuntu placement_groups: pgrp1: diff --git a/samples/ping-hot.yaml b/samples/ping-hot.yaml index c6366343c..e61c33c8f 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.5 + image: yardstick-image 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 bd3411989..43744b186 100755 --- a/samples/ping-iteration.yaml +++ b/samples/ping-iteration.yaml @@ -31,9 +31,9 @@ scenarios: context: name: demo - image: cirros-0.3.5 + image: yardstick-image flavor: yardstick-flavor - user: cirros + user: ubuntu placement_groups: pgrp1: diff --git a/samples/ping-multiple-context.yaml b/samples/ping-multiple-context.yaml index 7180dae37..a156bf554 100644 --- a/samples/ping-multiple-context.yaml +++ b/samples/ping-multiple-context.yaml @@ -31,9 +31,9 @@ scenarios: contexts: - name: demo1 - image: cirros-0.3.5 + image: yardstick-image flavor: yardstick-flavor - user: cirros + user: ubuntu placement_groups: pgrp1: policy: "availability" @@ -46,9 +46,9 @@ contexts: cidr: '10.0.1.0/24' - name: demo2 - image: cirros-0.3.5 + image: yardstick-image flavor: yardstick-flavor - user: cirros + user: ubuntu placement_groups: pgrp1: policy: "availability" diff --git a/samples/ping-multiple-vm.yaml b/samples/ping-multiple-vm.yaml index 7eae13004..6f3d6a1bc 100644 --- a/samples/ping-multiple-vm.yaml +++ b/samples/ping-multiple-vm.yaml @@ -35,9 +35,9 @@ scenarios: context: name: demo - image: cirros-0.3.5 + image: yardstick-image flavor: yardstick-flavor - user: cirros + user: ubuntu servers: athena: diff --git a/samples/ping-option-list.yaml b/samples/ping-option-list.yaml index 844431962..cc7ae8768 100644 --- a/samples/ping-option-list.yaml +++ b/samples/ping-option-list.yaml @@ -29,9 +29,9 @@ scenarios: context: name: demo - image: cirros-0.3.5 + image: yardstick-image flavor: yardstick-flavor - user: cirros + user: ubuntu placement_groups: pgrp1: diff --git a/samples/ping-parallel.yaml b/samples/ping-parallel.yaml index 8600cbb7f..c9a22a512 100644 --- a/samples/ping-parallel.yaml +++ b/samples/ping-parallel.yaml @@ -43,9 +43,9 @@ scenarios: context: name: demo - image: cirros-0.3.5 + image: yardstick-image flavor: yardstick-flavor - user: cirros + user: ubuntu placement_groups: pgrp1: diff --git a/samples/ping-serial.yaml b/samples/ping-serial.yaml index 419c9459f..3691c296f 100644 --- a/samples/ping-serial.yaml +++ b/samples/ping-serial.yaml @@ -42,9 +42,9 @@ scenarios: context: name: demo - image: cirros-0.3.5 + image: yardstick-image flavor: yardstick-flavor - user: cirros + user: ubuntu servers: apollo: diff --git a/samples/ping-template.yaml b/samples/ping-template.yaml index a7327342c..060ca3e67 100644 --- a/samples/ping-template.yaml +++ b/samples/ping-template.yaml @@ -36,9 +36,9 @@ scenarios: context: name: demo - image: cirros-0.3.5 + image: yardstick-image flavor: yardstick-flavor - user: cirros + user: ubuntu placement_groups: pgrp1: diff --git a/samples/ping.yaml b/samples/ping.yaml index 6a19d260b..2d0a96d1b 100644 --- a/samples/ping.yaml +++ b/samples/ping.yaml @@ -34,9 +34,9 @@ scenarios: context: name: demo - image: cirros-0.3.5 + image: yardstick-image flavor: yardstick-flavor - user: cirros + user: ubuntu placement_groups: pgrp1: diff --git a/samples/ping_bottlenecks.yaml b/samples/ping_bottlenecks.yaml index 01977a1de..e6fef4259 100644 --- a/samples/ping_bottlenecks.yaml +++ b/samples/ping_bottlenecks.yaml @@ -34,9 +34,9 @@ contexts: {% for num in range(stack_num) %} - name: demo{{num}} - image: cirros-0.3.5 + image: yardstick-image flavor: yardstick-flavor - user: cirros + user: ubuntu placement_groups: pgrp1: diff --git a/samples/ping_load.yaml b/samples/ping_load.yaml index 2afb1310a..ea1163dcb 100644 --- a/samples/ping_load.yaml +++ b/samples/ping_load.yaml @@ -34,9 +34,9 @@ scenarios: contexts: - name: demo1 - image: cirros-0.3.5 + image: yardstick-image flavor: yardstick-flavor - user: cirros + user: ubuntu placement_groups: pgrp1: @@ -58,9 +58,9 @@ contexts: cidr: '10.0.1.0/24' - name: demo2 - image: cirros-0.3.5 + image: yardstick-image flavor: yardstick-flavor - user: cirros + user: ubuntu placement_groups: pgrp1: policy: "availability" diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc081.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc081.yaml index 0d79a41ed..fc7eb006c 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc081.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc081.yaml @@ -46,9 +46,9 @@ contexts: - type: Heat name: openstack - image: cirros-0.3.5 + image: yardstick-image flavor: yardstick-flavor - user: cirros + user: ubuntu servers: target: -- cgit 1.2.3-korg