[CI] Fix image regexp and version

Default image in devstack was changed recently from uec to qcow2.
All rally jobs except rally-mos now need to be updated accordingly.

devstack changes:
* Id65ebae73b28da7185cb349b714b659af51ef77f
* I5c154ec25555e768954538fc22b4f5d5975b2deb


Change-Id: Ia4d4afb661d8bcc7c38b0a16b508294f789eef14
This commit is contained in:
Anton Studenov 2017-02-16 14:29:06 +03:00
parent 8c59aa334f
commit 24fdc1a6a2
127 changed files with 168 additions and 168 deletions

View File

@ -1,5 +1,5 @@
{%- set glance_image_location = glance_image_location|default("https://download.cirros-cloud.net/0.3.4/cirros-0.3.4-i386-disk.img") %} {%- set glance_image_location = glance_image_location|default("https://download.cirros-cloud.net/0.3.5/cirros-0.3.5-i386-disk.img") %}
{%- set image_name = image_name|default("^(cirros.*uec|TestVM)$") %} {%- set image_name = image_name|default("^(cirros.*-disk|TestVM)$") %}
{%- set flavor_name = flavor_name|default("m1.tiny") %} {%- set flavor_name = flavor_name|default("m1.tiny") %}
{%- set use_existing_users = use_existing_users|default(false) %} {%- set use_existing_users = use_existing_users|default(false) %}
{%- set service_list = service_list|default(["authentication", "cinder", "keystone", "nova", "glance", "neutron"]) %} {%- set service_list = service_list|default(["authentication", "cinder", "keystone", "nova", "glance", "neutron"]) %}

View File

@ -7,7 +7,7 @@
- cinder - cinder
- glance - glance
use_existing_users: false use_existing_users: false
image_name: "^(cirros.*uec|TestVM)$" image_name: "^(cirros.*-disk|TestVM)$"
flavor_name: "m1.tiny" flavor_name: "m1.tiny"
glance_image_location: "" glance_image_location: ""
smoke: true smoke: true

View File

@ -170,7 +170,7 @@ values:
--- ---
image_name: "^cirros.*uec$" image_name: "^cirros.*-disk$"
this file will be automatically used by Rally to substitute the variables in this file will be automatically used by Rally to substitute the variables in
*myscenario.yaml*. *myscenario.yaml*.

View File

@ -115,7 +115,7 @@ servers (*samples/tasks/scenarios/nova/boot-and-delete.json*):
"name": "m1.tiny" "name": "m1.tiny"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
}, },
"force_delete": false "force_delete": false
}, },
@ -169,7 +169,7 @@ To start a benchmark task, run the ``task start`` command (you can also add the
args values: args values:
{u'args': {u'flavor': {u'name': u'm1.tiny'}, {u'args': {u'flavor': {u'name': u'm1.tiny'},
u'force_delete': False, u'force_delete': False,
u'image': {u'name': u'^cirros.*uec$'}}, u'image': {u'name': u'^cirros.*-disk$'}},
u'context': {u'users': {u'project_domain': u'default', u'context': {u'users': {u'project_domain': u'default',
u'resource_management_workers': 30, u'resource_management_workers': 30,
u'tenants': 3, u'tenants': 3,

View File

@ -71,7 +71,7 @@ JSON file:
"name": "m1.tiny" "name": "m1.tiny"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
}, },
"force_delete": false "force_delete": false
}, },
@ -168,7 +168,7 @@ you want to run the **boot_and_delete_server** scenario twice: first using the
"name": "m1.tiny" "name": "m1.tiny"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
}, },
"force_delete": false "force_delete": false
}, },
@ -181,7 +181,7 @@ you want to run the **boot_and_delete_server** scenario twice: first using the
"name": "m1.small" "name": "m1.small"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
}, },
"force_delete": false "force_delete": false
}, },

View File

@ -153,7 +153,7 @@ to use existing users, like in the following configuration file
"name": "m1.tiny" "name": "m1.tiny"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
}, },
"force_delete": false "force_delete": false
}, },

View File

@ -39,7 +39,7 @@ runs a set of Nova scenarios:
flavor: flavor:
name: "m1.tiny" name: "m1.tiny"
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
runner: runner:
type: "constant" type: "constant"
times: 2 times: 2
@ -55,7 +55,7 @@ runs a set of Nova scenarios:
flavor: flavor:
name: "m1.tiny" name: "m1.tiny"
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
to_flavor: to_flavor:
name: "m1.small" name: "m1.small"
runner: runner:
@ -67,11 +67,11 @@ runs a set of Nova scenarios:
tenants: 1 tenants: 1
users_per_tenant: 1 users_per_tenant: 1
In both scenarios above, the *"^cirros.*uec$"* image is passed to the scenario In both scenarios above, the *"^cirros.*-disk$"* image is passed to the
as an argument (so that these scenarios use an appropriate image while booting scenario as an argument (so that these scenarios use an appropriate image while
servers). Lets say you want to run the same set of scenarios with the same booting servers). Lets say you want to run the same set of scenarios with the
runner/context/sla, but you want to try another image while booting server to same runner/context/sla, but you want to try another image while booting server
compare the performance. The most elegant solution is then to turn the image to compare the performance. The most elegant solution is then to turn the image
name into a template variable: name into a template variable:
.. code-block:: yaml .. code-block:: yaml
@ -121,8 +121,8 @@ a JSON or YAML dictionary):
.. code-block:: bash .. code-block:: bash
rally task start task.yaml --task-args '{"image_name": "^cirros.*uec$"}' rally task start task.yaml --task-args '{"image_name": "^cirros.*-disk$"}'
rally task start task.yaml --task-args 'image_name: "^cirros.*uec$"' rally task start task.yaml --task-args 'image_name: "^cirros.*-disk$"'
2. Refer to a file that specifies the argument values (JSON/YAML): 2. Refer to a file that specifies the argument values (JSON/YAML):
@ -138,7 +138,7 @@ where the files containing argument values should look as follows:
.. code-block:: json .. code-block:: json
{ {
"image_name": "^cirros.*uec$" "image_name": "^cirros.*-disk$"
} }
*args.yaml*: *args.yaml*:
@ -146,14 +146,14 @@ where the files containing argument values should look as follows:
.. code-block:: yaml .. code-block:: yaml
--- ---
image_name: "^cirros.*uec$" image_name: "^cirros.*-disk$"
Passed in either way, these parameter values will be substituted by Rally when Passed in either way, these parameter values will be substituted by Rally when
starting a task: starting a task:
.. code-block:: console .. code-block:: console
$ rally task start task.yaml --task-args "image_name: "^cirros.*uec$"" $ rally task start task.yaml --task-args "image_name: "^cirros.*-disk$""
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Preparing input task Preparing input task
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
@ -167,7 +167,7 @@ starting a task:
flavor: flavor:
name: "m1.tiny" name: "m1.tiny"
image: image:
name: ^cirros.*uec$ name: ^cirros.*-disk$
runner: runner:
type: "constant" type: "constant"
times: 2 times: 2
@ -183,7 +183,7 @@ starting a task:
flavor: flavor:
name: "m1.tiny" name: "m1.tiny"
image: image:
name: ^cirros.*uec$ name: ^cirros.*-disk$
to_flavor: to_flavor:
name: "m1.small" name: "m1.small"
runner: runner:
@ -212,7 +212,7 @@ should be set using the *{% set ... %}* clause (*task.yaml*):
.. code-block:: yaml .. code-block:: yaml
{% set image_name = image_name or "^cirros.*uec$" %} {% set image_name = image_name or "^cirros.*-disk$" %}
--- ---
NovaServers.boot_and_delete_server: NovaServers.boot_and_delete_server:
@ -252,7 +252,7 @@ default one will be used:
flavor: flavor:
name: "m1.tiny" name: "m1.tiny"
image: image:
name: ^cirros.*uec$ name: ^cirros.*-disk$
runner: runner:
type: "constant" type: "constant"
times: 2 times: 2

View File

@ -23,7 +23,7 @@ file a user can specify:
.. code-block:: yaml .. code-block:: yaml
image: image:
regex: cirros-.*-uec regex: cirros-.*-disk
flavor: flavor:
name: m1.tiny name: m1.tiny

View File

@ -140,6 +140,14 @@
# point value) # point value)
#cinder_volume_delete_poll_interval = 2.0 #cinder_volume_delete_poll_interval = 2.0
# Time to wait for cinder backup to be restored. (floating point
# value)
#cinder_backup_restore_timeout = 600.0
# Interval between checks when waiting for backup restoring. (floating
# point value)
#cinder_backup_restore_poll_interval = 2.0
# Time to sleep after boot before polling for status (floating point # Time to sleep after boot before polling for status (floating point
# value) # value)
#ec2_server_boot_prepoll_delay = 1.0 #ec2_server_boot_prepoll_delay = 1.0
@ -616,7 +624,7 @@
# Deprecated group/name - [DATABASE]/sql_max_retries # Deprecated group/name - [DATABASE]/sql_max_retries
#max_retries = 10 #max_retries = 10
# Interval between retries of opening an SQL connection. (integer # Interval between retries of opening a SQL connection. (integer
# value) # value)
# Deprecated group/name - [DEFAULT]/sql_retry_interval # Deprecated group/name - [DEFAULT]/sql_retry_interval
# Deprecated group/name - [DATABASE]/reconnect_interval # Deprecated group/name - [DATABASE]/reconnect_interval
@ -683,15 +691,12 @@
# #
# image URL (string value) # image URL (string value)
# Deprecated group/name - [image]/cirros_img_url #img_url = http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img
#img_url = http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img
# Image disk format to use when creating the image (string value) # Image disk format to use when creating the image (string value)
# Deprecated group/name - [image]/disk_format
#img_disk_format = qcow2 #img_disk_format = qcow2
# Image container format to use when creating the image (string value) # Image container format to use when creating the image (string value)
# Deprecated group/name - [image]/container_format
#img_container_format = bare #img_container_format = bare
# Regular expression for name of a public image to discover it in the # Regular expression for name of a public image to discover it in the
@ -701,25 +706,20 @@
# this case Rally will create needed resources by itself if the values # this case Rally will create needed resources by itself if the values
# for the corresponding config options are not specified in the # for the corresponding config options are not specified in the
# Tempest config file (string value) # Tempest config file (string value)
# Deprecated group/name - [image]/name_regex
#img_name_regex = ^.*(cirros|testvm).*$ #img_name_regex = ^.*(cirros|testvm).*$
# Role required for users to be able to create Swift containers # Role required for users to be able to create Swift containers
# (string value) # (string value)
# Deprecated group/name - [role]/swift_operator_role
#swift_operator_role = Member #swift_operator_role = Member
# User role that has reseller admin (string value) # User role that has reseller admin (string value)
# Deprecated group/name - [role]/swift_reseller_admin_role
#swift_reseller_admin_role = ResellerAdmin #swift_reseller_admin_role = ResellerAdmin
# Role required for users to be able to manage Heat stacks (string # Role required for users to be able to manage Heat stacks (string
# value) # value)
# Deprecated group/name - [role]/heat_stack_owner_role
#heat_stack_owner_role = heat_stack_owner #heat_stack_owner_role = heat_stack_owner
# Role for Heat template-defined users (string value) # Role for Heat template-defined users (string value)
# Deprecated group/name - [role]/heat_stack_user_role
#heat_stack_user_role = heat_stack_user #heat_stack_user_role = heat_stack_user
# Primary flavor RAM size used by most of the test cases (integer # Primary flavor RAM size used by most of the test cases (integer

View File

@ -7,9 +7,9 @@
- cinder - cinder
- glance - glance
use_existing_users: false use_existing_users: false
image_name: "^(cirros.*uec|TestVM)$" image_name: "^(cirros.*-disk|TestVM)$"
flavor_name: "m1.tiny" flavor_name: "m1.tiny"
glance_image_location: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" glance_image_location: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img"
smoke: true smoke: true
users_amount: 1 users_amount: 1
tenants_amount: 1 tenants_amount: 1

View File

@ -1,4 +1,4 @@
{% set image_name = "^(cirros.*uec|TestVM)$" %} {% set image_name = "^(cirros.*-disk|TestVM)$" %}
{% set flavor_name = "m1.tiny" %} {% set flavor_name = "m1.tiny" %}
--- ---
Authenticate.validate_cinder: Authenticate.validate_cinder:

View File

@ -8,7 +8,7 @@ parameters:
- custom_constraint: nova.flavor - custom_constraint: nova.flavor
image: image:
type: string type: string
default: cirros-0.3.4-x86_64-uec default: cirros-0.3.5-x86_64-disk
constraints: constraints:
- custom_constraint: glance.image - custom_constraint: glance.image
scaling_adjustment: scaling_adjustment:

View File

@ -14,7 +14,7 @@ parameters:
- range: {min: 1} - range: {min: 1}
instance_image: instance_image:
type: string type: string
default: cirros-0.3.4-x86_64-uec default: cirros-0.3.5-x86_64-disk
instance_volume_size: instance_volume_size:
type: number type: number
description: Size of volume to attach to instance description: Size of volume to attach to instance

View File

@ -7,7 +7,7 @@ parameters:
default: public default: public
image: image:
type: string type: string
default: cirros-0.3.4-x86_64-uec default: cirros-0.3.5-x86_64-disk
flavor: flavor:
type: string type: string
default: m1.tiny default: m1.tiny

View File

@ -4,7 +4,7 @@ parameters:
# set all correct defaults for parameters before launch test # set all correct defaults for parameters before launch test
image: image:
type: string type: string
default: cirros-0.3.4-x86_64-uec default: cirros-0.3.5-x86_64-disk
flavor: flavor:
type: string type: string
default: m1.tiny default: m1.tiny

View File

@ -1,5 +1,5 @@
{%- set cirros_image_url = "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" %} {%- set cirros_image_url = "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" %}
{% set image_name = "^(cirros.*uec|TestVM)$" %} {% set image_name = "^(cirros.*-disk|TestVM)$" %}
{% set flavor_name = "m1.tiny" %} {% set flavor_name = "m1.tiny" %}
{% set volume_type = "" %} {% set volume_type = "" %}
--- ---

View File

@ -1,4 +1,4 @@
{%- set cirros_image_url = "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" %} {%- set cirros_image_url = "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" %}
--- ---
KeystoneBasic.create_user: KeystoneBasic.create_user:
- -

View File

@ -1,4 +1,4 @@
{% set image_name = "^cirros.*uec$" %} {% set image_name = "^cirros.*-disk$" %}
{% set smoke = 0 %} {% set smoke = 0 %}
--- ---

View File

@ -1,4 +1,4 @@
{% set image_name = "^cirros.*uec$" %} {% set image_name = "^cirros.*-disk$" %}
{% set flavor_name = "m1.tiny" %} {% set flavor_name = "m1.tiny" %}
{% set smoke = 0 %} {% set smoke = 0 %}

View File

@ -19,7 +19,7 @@
properties: properties:
name: cirros_server name: cirros_server
flavor: 1 flavor: 1
image: "cirros-0.3.4-x86_64-uec" image: "cirros-0.3.5-x86_64-disk.img"
networks: networks:
- network: private - network: private
sla: sla:

View File

@ -1,4 +1,4 @@
{%- set cirros_image_url = "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" %} {%- set cirros_image_url = "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" %}
--- ---
KeystoneBasic.create_user: KeystoneBasic.create_user:
- -

View File

@ -1,3 +1,3 @@
--- ---
image_name: "^cirros.*uec$" image_name: "^cirros.*-disk$"

View File

@ -1,4 +1,4 @@
{% set image_name = "^cirros.*uec$" %} {% set image_name = "^cirros.*-disk$" %}
{% set flavor_name = "m1.nano" %} {% set flavor_name = "m1.nano" %}
{% set smoke = 0 %} {% set smoke = 0 %}
--- ---

View File

@ -82,7 +82,7 @@ class OpenStackAPIVersions(context.Context):
"args": { "args": {
"size": 10, "size": 10,
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
}, },
"flavor": { "flavor": {
"name": "m1.tiny" "name": "m1.tiny"
@ -126,7 +126,7 @@ class OpenStackAPIVersions(context.Context):
"args": { "args": {
"size": 10, "size": 10,
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
}, },
"flavor": { "flavor": {
"name": "m1.tiny" "name": "m1.tiny"

View File

@ -29,7 +29,7 @@ from rally.verification import utils
TEMPEST_OPTS = [ TEMPEST_OPTS = [
cfg.StrOpt("img_url", cfg.StrOpt("img_url",
default="http://download.cirros-cloud.net/" default="http://download.cirros-cloud.net/"
"0.3.4/cirros-0.3.4-x86_64-disk.img", "0.3.5/cirros-0.3.5-x86_64-disk.img",
help="image URL"), help="image URL"),
cfg.StrOpt("img_disk_format", cfg.StrOpt("img_disk_format",
default="qcow2", default="qcow2",

View File

@ -6,7 +6,7 @@
"name": "^ram64$" "name": "^ram64$"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
} }
}, },
"runner": { "runner": {

View File

@ -5,7 +5,7 @@
flavor: flavor:
name: "^ram64$" name: "^ram64$"
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
runner: runner:
type: "constant" type: "constant"
times: 10 times: 10

View File

@ -6,7 +6,7 @@
"args": { "args": {
"size": 10, "size": 10,
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
}, },
"flavor": { "flavor": {
"name": "{{flavor_name}}" "name": "{{flavor_name}}"
@ -37,7 +37,7 @@
"name": "{{flavor_name}}" "name": "{{flavor_name}}"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
}, },
"create_volume_params": { "create_volume_params": {
"availability_zone": "{{availability_zone}}" "availability_zone": "{{availability_zone}}"

View File

@ -6,7 +6,7 @@
args: args:
size: 10 size: 10
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
flavor: flavor:
name: "{{flavor_name}}" name: "{{flavor_name}}"
create_volume_params: create_volume_params:
@ -27,7 +27,7 @@
flavor: flavor:
name: "{{flavor_name}}" name: "{{flavor_name}}"
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
create_volume_params: create_volume_params:
availability_zone: "{{availability_zone}}" availability_zone: "{{availability_zone}}"
runner: runner:

View File

@ -8,7 +8,7 @@
"disk_format": "raw", "disk_format": "raw",
"do_delete": true, "do_delete": true,
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
} }
}, },
"runner": { "runner": {
@ -34,7 +34,7 @@
"disk_format": "raw", "disk_format": "raw",
"do_delete": true, "do_delete": true,
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
} }
}, },
"runner": { "runner": {

View File

@ -8,7 +8,7 @@
disk_format: "raw" disk_format: "raw"
do_delete: true do_delete: true
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
runner: runner:
type: "constant" type: "constant"
times: 3 times: 3
@ -27,7 +27,7 @@
disk_format: "raw" disk_format: "raw"
do_delete: true do_delete: true
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
runner: runner:
type: "constant" type: "constant"
times: 3 times: 3

View File

@ -4,7 +4,7 @@
"args": { "args": {
"size": 1, "size": 1,
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
} }
}, },
"runner": { "runner": {

View File

@ -4,7 +4,7 @@
args: args:
size: 1 size: 1
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
runner: runner:
type: "constant" type: "constant"
times: 2 times: 2

View File

@ -21,7 +21,7 @@
}, },
"servers": { "servers": {
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
}, },
"flavor": { "flavor": {
"name": "{{flavor_name}}" "name": "{{flavor_name}}"

View File

@ -17,7 +17,7 @@
users_per_tenant: 1 users_per_tenant: 1
servers: servers:
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
flavor: flavor:
name: "{{flavor_name}}" name: "{{flavor_name}}"
servers_per_tenant: 2 servers_per_tenant: 2

View File

@ -21,7 +21,7 @@
}, },
"servers": { "servers": {
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
}, },
"flavor": { "flavor": {
"name": "{{flavor_name}}" "name": "{{flavor_name}}"
@ -50,7 +50,7 @@
}, },
"servers": { "servers": {
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
}, },
"flavor": { "flavor": {
"name": "{{flavor_name}}" "name": "{{flavor_name}}"

View File

@ -17,7 +17,7 @@
users_per_tenant: 1 users_per_tenant: 1
servers: servers:
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
flavor: flavor:
name: "{{flavor_name}}" name: "{{flavor_name}}"
servers_per_tenant: 2 servers_per_tenant: 2
@ -37,7 +37,7 @@
users_per_tenant: 1 users_per_tenant: 1
servers: servers:
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
flavor: flavor:
name: "{{flavor_name}}" name: "{{flavor_name}}"
servers_per_tenant: 2 servers_per_tenant: 2

View File

@ -7,7 +7,7 @@
"name": "{{flavor_name}}" "name": "{{flavor_name}}"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
} }
}, },
"runner": { "runner": {

View File

@ -6,7 +6,7 @@
flavor: flavor:
name: "{{flavor_name}}" name: "{{flavor_name}}"
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
runner: runner:
type: "constant" type: "constant"
times: 10 times: 10

View File

@ -16,7 +16,7 @@
"name": "m1.tiny" "name": "m1.tiny"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
}, },
"servers_per_tenant": 2 "servers_per_tenant": 2
} }

View File

@ -13,5 +13,5 @@
flavor: flavor:
name: "m1.tiny" name: "m1.tiny"
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
servers_per_tenant: 2 servers_per_tenant: 2

View File

@ -2,7 +2,7 @@
"GlanceImages.create_and_delete_image": [ "GlanceImages.create_and_delete_image": [
{ {
"args": { "args": {
"image_location": "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img", "image_location": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img",
"container_format": "bare", "container_format": "bare",
"disk_format": "qcow2" "disk_format": "qcow2"
}, },

View File

@ -2,7 +2,7 @@
GlanceImages.create_and_delete_image: GlanceImages.create_and_delete_image:
- -
args: args:
image_location: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" image_location: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img"
container_format: "bare" container_format: "bare"
disk_format: "qcow2" disk_format: "qcow2"
runner: runner:

View File

@ -2,7 +2,7 @@
"GlanceImages.create_and_list_image": [ "GlanceImages.create_and_list_image": [
{ {
"args": { "args": {
"image_location": "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img", "image_location": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img",
"container_format": "bare", "container_format": "bare",
"disk_format": "qcow2" "disk_format": "qcow2"
}, },

View File

@ -2,7 +2,7 @@
GlanceImages.create_and_list_image: GlanceImages.create_and_list_image:
- -
args: args:
image_location: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" image_location: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img"
container_format: "bare" container_format: "bare"
disk_format: "qcow2" disk_format: "qcow2"
runner: runner:

View File

@ -3,7 +3,7 @@
"GlanceImages.create_image_and_boot_instances": [ "GlanceImages.create_image_and_boot_instances": [
{ {
"args": { "args": {
"image_location": "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img", "image_location": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img",
"container_format": "bare", "container_format": "bare",
"disk_format": "qcow2", "disk_format": "qcow2",
"flavor": { "flavor": {

View File

@ -3,7 +3,7 @@
GlanceImages.create_image_and_boot_instances: GlanceImages.create_image_and_boot_instances:
- -
args: args:
image_location: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" image_location: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img"
container_format: "bare" container_format: "bare"
disk_format: "qcow2" disk_format: "qcow2"
flavor: flavor:

View File

@ -12,7 +12,7 @@
"users_per_tenant": 2 "users_per_tenant": 2
}, },
"images": { "images": {
"image_url": "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img", "image_url": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img",
"image_type": "qcow2", "image_type": "qcow2",
"image_container": "bare", "image_container": "bare",
"images_per_tenant": 4 "images_per_tenant": 4

View File

@ -10,7 +10,7 @@
tenants: 2 tenants: 2
users_per_tenant: 2 users_per_tenant: 2
images: images:
image_url: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img"
image_type: "qcow2" image_type: "qcow2"
image_container: "bare" image_container: "bare"
images_per_tenant: 4 images_per_tenant: 4

View File

@ -8,7 +8,7 @@ parameters:
- custom_constraint: nova.flavor - custom_constraint: nova.flavor
image: image:
type: string type: string
default: cirros-0.3.4-x86_64-uec default: cirros-0.3.5-x86_64-disk
constraints: constraints:
- custom_constraint: glance.image - custom_constraint: glance.image
scaling_adjustment: scaling_adjustment:

View File

@ -14,7 +14,7 @@ parameters:
- range: {min: 1} - range: {min: 1}
instance_image: instance_image:
type: string type: string
default: cirros-0.3.4-x86_64-uec default: cirros-0.3.5-x86_64-disk
instance_volume_size: instance_volume_size:
type: number type: number
description: Size of volume to attach to instance description: Size of volume to attach to instance

View File

@ -7,7 +7,7 @@ parameters:
default: public default: public
image: image:
type: string type: string
default: cirros-0.3.4-x86_64-uec default: cirros-0.3.5-x86_64-disk
flavor: flavor:
type: string type: string
default: m1.tiny default: m1.tiny

View File

@ -4,7 +4,7 @@ parameters:
# set all correct defaults for parameters before launch test # set all correct defaults for parameters before launch test
image: image:
type: string type: string
default: cirros-0.3.4-x86_64-uec default: cirros-0.3.5-x86_64-disk
flavor: flavor:
type: string type: string
default: m1.tiny default: m1.tiny

View File

@ -12,7 +12,7 @@
"name": "{{flavor_name}}" "name": "{{flavor_name}}"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
} }
}, },
"context": { "context": {

View File

@ -6,7 +6,7 @@
flavor: flavor:
name: "{{flavor_name}}" name: "{{flavor_name}}"
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
runner: runner:
type: "constant" type: "constant"
times: 1 times: 1

View File

@ -7,7 +7,7 @@
"name": "{{flavor_name}}" "name": "{{flavor_name}}"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
}, },
"block_migration": true "block_migration": true
}, },

View File

@ -5,7 +5,7 @@
flavor: flavor:
name: "{{flavor_name}}" name: "{{flavor_name}}"
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
block_migration: true block_migration: true
runner: runner:
type: "constant" type: "constant"

View File

@ -10,7 +10,7 @@
"args": { "args": {
"count": 5, "count": 5,
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
}, },
"flavor": { "flavor": {
"name": "{{flavor_name}}" "name": "{{flavor_name}}"

View File

@ -4,7 +4,7 @@
- -
args: args:
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
flavor: flavor:
name: "{{flavor_name}}" name: "{{flavor_name}}"
count: 5 count: 5

View File

@ -7,7 +7,7 @@
"name": "{{flavor_name}}" "name": "{{flavor_name}}"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
}, },
"boot_server_kwargs": {} "boot_server_kwargs": {}
}, },

View File

@ -6,7 +6,7 @@
flavor: flavor:
name: "{{flavor_name}}" name: "{{flavor_name}}"
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
boot_server_kwargs: {} boot_server_kwargs: {}
runner: runner:
type: "constant" type: "constant"

View File

@ -7,7 +7,7 @@
"name": "{{flavor_name}}" "name": "{{flavor_name}}"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
}, },
"security_group_count": 10, "security_group_count": 10,
"rules_per_security_group": 10 "rules_per_security_group": 10

View File

@ -6,7 +6,7 @@
flavor: flavor:
name: "{{flavor_name}}" name: "{{flavor_name}}"
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
security_group_count: 10 security_group_count: 10
rules_per_security_group: 10 rules_per_security_group: 10
runner: runner:

View File

@ -7,7 +7,7 @@
"name": "{{flavor_name}}" "name": "{{flavor_name}}"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
}, },
"force_delete": false "force_delete": false
}, },
@ -29,7 +29,7 @@
"name": "{{flavor_name}}" "name": "{{flavor_name}}"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
}, },
"auto_assign_nic": true "auto_assign_nic": true
}, },

View File

@ -6,7 +6,7 @@
flavor: flavor:
name: "{{flavor_name}}" name: "{{flavor_name}}"
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
force_delete: false force_delete: false
runner: runner:
type: "constant" type: "constant"
@ -22,7 +22,7 @@
flavor: flavor:
name: "{{flavor_name}}" name: "{{flavor_name}}"
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
auto_assign_nic: true auto_assign_nic: true
runner: runner:
type: "constant" type: "constant"

View File

@ -1,5 +1,5 @@
{% set flavor_name = flavor_name or "m1.tiny" %} {% set flavor_name = flavor_name or "m1.tiny" %}
{% set image_name = image_name or "^cirros.*uec$" %} {% set image_name = image_name or "^cirros.*-disk$" %}
{ {
"NovaServers.boot_and_get_console_output": [ "NovaServers.boot_and_get_console_output": [
{ {

View File

@ -1,5 +1,5 @@
{% set flavor_name = flavor_name or "m1.tiny" %} {% set flavor_name = flavor_name or "m1.tiny" %}
{% set image_name = image_name or "^cirros.*uec$" %} {% set image_name = image_name or "^cirros.*-disk$" %}
--- ---
NovaServers.boot_and_get_console_output: NovaServers.boot_and_get_console_output:
- -

View File

@ -7,7 +7,7 @@
"name": "{{flavor_name}}" "name": "{{flavor_name}}"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
}, },
"detailed": true "detailed": true
}, },

View File

@ -6,7 +6,7 @@
flavor: flavor:
name: "{{flavor_name}}" name: "{{flavor_name}}"
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
detailed: True detailed: True
runner: runner:
type: "constant" type: "constant"

View File

@ -7,7 +7,7 @@
"name": "{{flavor_name}}" "name": "{{flavor_name}}"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
}, },
"block_migration": false "block_migration": false
}, },

View File

@ -5,7 +5,7 @@
flavor: flavor:
name: "{{flavor_name}}" name: "{{flavor_name}}"
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
block_migration: false block_migration: false
runner: runner:
type: "constant" type: "constant"

View File

@ -7,7 +7,7 @@
"name": "{{flavor_name}}" "name": "{{flavor_name}}"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
} }
}, },
"runner": { "runner": {

View File

@ -5,7 +5,7 @@
flavor: flavor:
name: "{{flavor_name}}" name: "{{flavor_name}}"
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
runner: runner:
type: "constant" type: "constant"
times: 10 times: 10

View File

@ -7,10 +7,10 @@
"name": "{{flavor_name}}" "name": "{{flavor_name}}"
}, },
"from_image": { "from_image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
}, },
"to_image": { "to_image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
} }
}, },
"runner": { "runner": {

View File

@ -5,9 +5,9 @@
flavor: flavor:
name: "{{flavor_name}}" name: "{{flavor_name}}"
from_image: from_image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
to_image: to_image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
runner: runner:
type: "constant" type: "constant"
times: 5 times: 5

View File

@ -1,5 +1,5 @@
{% set flavor_name = flavor_name or "m1.tiny" %} {% set flavor_name = flavor_name or "m1.tiny" %}
{% set image_name = image_name or "^cirros.*uec$" %} {% set image_name = image_name or "^cirros.*-disk$" %}
{ {
"NovaServers.boot_and_show_server": [ "NovaServers.boot_and_show_server": [
{ {

View File

@ -1,5 +1,5 @@
{% set flavor_name = flavor_name or "m1.tiny" %} {% set flavor_name = flavor_name or "m1.tiny" %}
{% set image_name = image_name or "^cirros.*uec$" %} {% set image_name = image_name or "^cirros.*-disk$" %}
--- ---
NovaServers.boot_and_show_server: NovaServers.boot_and_show_server:
- -

View File

@ -7,7 +7,7 @@
"name": "{{flavor_name}}" "name": "{{flavor_name}}"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
} }
}, },
"runner": { "runner": {

View File

@ -6,7 +6,7 @@
flavor: flavor:
name: "{{flavor_name}}" name: "{{flavor_name}}"
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
runner: runner:
type: "constant" type: "constant"
times: 10 times: 10

View File

@ -7,7 +7,7 @@
"name": "{{flavor_name}}" "name": "{{flavor_name}}"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
}, },
"force_delete": false, "force_delete": false,
"actions": [ "actions": [

View File

@ -6,7 +6,7 @@
flavor: flavor:
name: "{{flavor_name}}" name: "{{flavor_name}}"
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
force_delete: false force_delete: false
actions: actions:
- -

View File

@ -8,7 +8,7 @@
"name": "{{flavor_name}}" "name": "{{flavor_name}}"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
}, },
"volume_size": 10, "volume_size": 10,
"volume_type": "{{volume_type}}", "volume_type": "{{volume_type}}",

View File

@ -7,7 +7,7 @@
flavor: flavor:
name: "{{flavor_name}}" name: "{{flavor_name}}"
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
volume_size: 10 volume_size: 10
volume_type: "{{volume_type}}" volume_type: "{{volume_type}}"
force_delete: false force_delete: false

View File

@ -7,7 +7,7 @@
"name": "{{flavor_name}}" "name": "{{flavor_name}}"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
}, },
"to_flavor": { "to_flavor": {
"name": "m1.small" "name": "m1.small"

View File

@ -6,7 +6,7 @@
flavor: flavor:
name: "{{flavor_name}}" name: "{{flavor_name}}"
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
to_flavor: to_flavor:
name: "m1.small" name: "m1.small"
confirm: true confirm: true

View File

@ -8,7 +8,7 @@
"name": "{{flavor_name}}" "name": "{{flavor_name}}"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
}, },
"volume_size": 10, "volume_size": 10,
"volume_type": "{{volume_type}}" "volume_type": "{{volume_type}}"

View File

@ -7,7 +7,7 @@
flavor: flavor:
name: "{{flavor_name}}" name: "{{flavor_name}}"
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
volume_size: 10 volume_size: 10
volume_type: "{{volume_type}}" volume_type: "{{volume_type}}"
runner: runner:

View File

@ -8,7 +8,7 @@
"name": "{{flavor_name}}" "name": "{{flavor_name}}"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
}, },
"volume_size": 10, "volume_size": 10,
"volume_type": "{{volume_type}}" "volume_type": "{{volume_type}}"

View File

@ -7,7 +7,7 @@
flavor: flavor:
name: "{{flavor_name}}" name: "{{flavor_name}}"
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
volume_size: 10 volume_size: 10
volume_type: "{{volume_type}}" volume_type: "{{volume_type}}"
runner: runner:

View File

@ -7,7 +7,7 @@
"name": "{{flavor_name}}" "name": "{{flavor_name}}"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
} }
}, },
"runner": { "runner": {

View File

@ -6,7 +6,7 @@
flavor: flavor:
name: "{{flavor_name}}" name: "{{flavor_name}}"
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
runner: runner:
type: "constant" type: "constant"
times: 10 times: 10

View File

@ -7,7 +7,7 @@
"name": "{{flavor_name}}" "name": "{{flavor_name}}"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
}, },
"security_group_count": 10, "security_group_count": 10,
"rules_per_security_group": 10 "rules_per_security_group": 10

View File

@ -6,7 +6,7 @@
flavor: flavor:
name: "{{flavor_name}}" name: "{{flavor_name}}"
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
security_group_count: 10 security_group_count: 10
rules_per_security_group: 10 rules_per_security_group: 10
runner: runner:

View File

@ -12,7 +12,7 @@
"name": "{{flavor_name}}" "name": "{{flavor_name}}"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
} }
}, },
"context": { "context": {

View File

@ -6,7 +6,7 @@
flavor: flavor:
name: "{{flavor_name}}" name: "{{flavor_name}}"
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
runner: runner:
type: "constant" type: "constant"
times: 5 times: 5

View File

@ -6,7 +6,7 @@
"size": 10, "size": 10,
"block_migration": false, "block_migration": false,
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
}, },
"flavor": { "flavor": {
"name": "{{flavor_name}}" "name": "{{flavor_name}}"

View File

@ -5,7 +5,7 @@
flavor: flavor:
name: "{{flavor_name}}" name: "{{flavor_name}}"
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
size: 10 size: 10
block_migration: false block_migration: false
boot_server_kwargs: {} boot_server_kwargs: {}

View File

@ -7,7 +7,7 @@
"name": "{{flavor_name}}" "name": "{{flavor_name}}"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
}, },
"to_flavor": { "to_flavor": {
"name": "m1.small" "name": "m1.small"

View File

@ -6,7 +6,7 @@
flavor: flavor:
name: "{{flavor_name}}" name: "{{flavor_name}}"
image: image:
name: "^cirros.*uec$" name: "^cirros.*-disk$"
to_flavor: to_flavor:
name: "m1.small" name: "m1.small"
confirm: true confirm: true

View File

@ -8,7 +8,7 @@
"name": "{{flavor_name}}" "name": "{{flavor_name}}"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*-disk$"
}, },
"block_migration": false, "block_migration": false,
"volume_size": 10, "volume_size": 10,

Some files were not shown because too many files have changed in this diff Show More