Make our CI great again
* remove nova-net scenarios. Nova-Network is dead. We do not have it in our gates * Do not duplicate VMTask scenarios in *-nova and *-neutron jobs. We have equal envs there, so we shouldn't waste infra's resources and test them twice. It is redundant. Let's keep VMTask scenarios only in *-neutron job for now and balance number of scenarios in each job in future. * Move Authenticate.validate_heat from main rally job to special *-heat job. * Return GlanceImages.create_image_and_boot_instances to keystone-api-v2 (it was broken due to nova-net). * NovaSecGroup.create_and_* scenarios from nova's gates switched to be launched at Neutron(Nova-API is a proxy in such cases), so we need to setup Neutron secutiry groups quotas for these scenarios Change-Id: Ib7d952e2f7b520d46a1b932e85d3cd70b2ff11aa
This commit is contained in:
parent
aacc3d30a3
commit
07111cb1dd
@ -349,3 +349,19 @@
|
||||
users:
|
||||
tenants: 2
|
||||
users_per_tenant: 2
|
||||
|
||||
Authenticate.validate_heat:
|
||||
-
|
||||
args:
|
||||
repetitions: 2
|
||||
runner:
|
||||
type: "constant"
|
||||
times: 10
|
||||
concurrency: 5
|
||||
context:
|
||||
users:
|
||||
tenants: 3
|
||||
users_per_tenant: 5
|
||||
sla:
|
||||
failure_rate:
|
||||
max: 0
|
||||
|
@ -299,6 +299,7 @@
|
||||
image:
|
||||
name: {{image_name}}
|
||||
servers_per_tenant: 2
|
||||
auto_assign_nic: True
|
||||
network:
|
||||
networks_per_tenant: 2
|
||||
sla:
|
||||
@ -769,9 +770,9 @@
|
||||
tenants: 3
|
||||
users_per_tenant: 2
|
||||
quotas:
|
||||
nova:
|
||||
security_groups: -1
|
||||
security_group_rules: -1
|
||||
neutron:
|
||||
security_group: -1
|
||||
security_group_rule: -1
|
||||
sla:
|
||||
failure_rate:
|
||||
max: 0
|
||||
@ -789,8 +790,8 @@
|
||||
tenants: 3
|
||||
users_per_tenant: 2
|
||||
quotas:
|
||||
nova:
|
||||
security_groups: -1
|
||||
neutron:
|
||||
security_group: -1
|
||||
sla:
|
||||
failure_rate:
|
||||
max: 0
|
||||
@ -810,30 +811,9 @@
|
||||
users_per_tenant: 2
|
||||
user_choice_method: "round_robin"
|
||||
quotas:
|
||||
nova:
|
||||
security_groups: -1
|
||||
security_group_rules: -1
|
||||
sla:
|
||||
failure_rate:
|
||||
max: 0
|
||||
|
||||
NovaSecGroup.create_and_list_secgroups:
|
||||
-
|
||||
args:
|
||||
security_group_count: 5
|
||||
rules_per_security_group: 5
|
||||
runner:
|
||||
type: "constant"
|
||||
times: 4
|
||||
concurrency: 4
|
||||
context:
|
||||
users:
|
||||
tenants: 3
|
||||
users_per_tenant: 2
|
||||
quotas:
|
||||
nova:
|
||||
security_groups: -1
|
||||
security_group_rules: -1
|
||||
neutron:
|
||||
security_group: -1
|
||||
security_group_rule: -1
|
||||
sla:
|
||||
failure_rate:
|
||||
max: 0
|
||||
@ -995,122 +975,6 @@
|
||||
tenants: 2
|
||||
users_per_tenant: 2
|
||||
|
||||
NovaFloatingIpsBulk.create_and_list_floating_ips_bulk:
|
||||
-
|
||||
args:
|
||||
start_cidr: "10.2.0.0/27"
|
||||
runner:
|
||||
type: "constant"
|
||||
times: 4
|
||||
concurrency: 2
|
||||
context:
|
||||
users:
|
||||
tenants: 2
|
||||
users_per_tenant: 2
|
||||
sla:
|
||||
failure_rate:
|
||||
max: 0
|
||||
|
||||
NovaFloatingIpsBulk.create_and_delete_floating_ips_bulk:
|
||||
-
|
||||
args:
|
||||
start_cidr: "10.2.0.0/27"
|
||||
runner:
|
||||
type: "constant"
|
||||
times: 4
|
||||
concurrency: 2
|
||||
context:
|
||||
users:
|
||||
tenants: 2
|
||||
users_per_tenant: 2
|
||||
sla:
|
||||
failure_rate:
|
||||
max: 0
|
||||
|
||||
VMTasks.boot_runcommand_delete:
|
||||
-
|
||||
args:
|
||||
flavor:
|
||||
name: {{flavor_name}}
|
||||
image:
|
||||
name: {{image_name}}
|
||||
floating_network: "public"
|
||||
use_floating_ip: true
|
||||
command:
|
||||
script_inline: |
|
||||
time_seconds(){ (time -p $1 ) 2>&1 |awk '/real/{print $2}'; }
|
||||
file=/tmp/test.img
|
||||
c=100 #100M
|
||||
write_seq=$(time_seconds "dd if=/dev/zero of=$file bs=1M count=$c")
|
||||
read_seq=$(time_seconds "dd if=$file of=/dev/null bs=1M count=$c")
|
||||
[ -f $file ] && rm $file
|
||||
|
||||
echo "{
|
||||
\"write_seq\": $write_seq,
|
||||
\"read_seq\": $read_seq
|
||||
}"
|
||||
interpreter: "/bin/sh"
|
||||
username: "cirros"
|
||||
runner:
|
||||
type: "constant"
|
||||
times: 2
|
||||
concurrency: 2
|
||||
context:
|
||||
users:
|
||||
tenants: 1
|
||||
users_per_tenant: 1
|
||||
sla:
|
||||
failure_rate:
|
||||
max: 0
|
||||
|
||||
-
|
||||
args:
|
||||
flavor:
|
||||
name: {{flavor_name}}
|
||||
image:
|
||||
name: {{image_name}}
|
||||
volume_args:
|
||||
size: 2
|
||||
use_floating_ip: true
|
||||
command:
|
||||
script_file: "~/.rally/extra/instance_test.sh"
|
||||
interpreter: "/bin/sh"
|
||||
username: "cirros"
|
||||
runner:
|
||||
type: "constant"
|
||||
times: 2
|
||||
concurrency: 2
|
||||
context:
|
||||
users:
|
||||
tenants: 1
|
||||
users_per_tenant: 1
|
||||
sla:
|
||||
failure_rate:
|
||||
max: 0
|
||||
|
||||
-
|
||||
args:
|
||||
flavor:
|
||||
name: {{flavor_name}}
|
||||
image:
|
||||
name: {{image_name}}
|
||||
use_floating_ip: false
|
||||
command:
|
||||
script_file: "~/.rally/extra/instance_test.sh"
|
||||
interpreter: "/bin/sh"
|
||||
username: "cirros"
|
||||
runner:
|
||||
type: "constant"
|
||||
times: 2
|
||||
concurrency: 2
|
||||
context:
|
||||
users:
|
||||
tenants: 1
|
||||
users_per_tenant: 1
|
||||
sla:
|
||||
failure_rate:
|
||||
max: 0
|
||||
|
||||
NovaFlavors.list_flavors:
|
||||
-
|
||||
args:
|
||||
|
@ -650,27 +650,27 @@
|
||||
failure_rate:
|
||||
max: 0
|
||||
|
||||
# GlanceImages.create_image_and_boot_instances:
|
||||
# -
|
||||
# args:
|
||||
# image_location: "{{ cirros_image_url }}"
|
||||
# container_format: "bare"
|
||||
# disk_format: "qcow2"
|
||||
# flavor:
|
||||
# name: "m1.tiny"
|
||||
# number_instances: 2
|
||||
# runner:
|
||||
# type: "constant"
|
||||
# times: 1
|
||||
# concurrency: 1
|
||||
# context:
|
||||
# users:
|
||||
# tenants: 3
|
||||
# users_per_tenant: 1
|
||||
# sla:
|
||||
# failure_rate:
|
||||
# max: 0
|
||||
#
|
||||
GlanceImages.create_image_and_boot_instances:
|
||||
-
|
||||
args:
|
||||
image_location: "{{ cirros_image_url }}"
|
||||
container_format: "bare"
|
||||
disk_format: "qcow2"
|
||||
flavor:
|
||||
name: "m1.tiny"
|
||||
number_instances: 2
|
||||
runner:
|
||||
type: "constant"
|
||||
times: 1
|
||||
concurrency: 1
|
||||
context:
|
||||
users:
|
||||
tenants: 3
|
||||
users_per_tenant: 1
|
||||
sla:
|
||||
failure_rate:
|
||||
max: 0
|
||||
|
||||
SwiftObjects.create_container_and_object_then_list_objects:
|
||||
-
|
||||
args:
|
||||
|
@ -1,4 +1,5 @@
|
||||
{% set image_name = "^cirros.*uec$" %}
|
||||
{% set flavor_name = "m1.tiny" %}
|
||||
{% set smoke = 0 %}
|
||||
|
||||
---
|
||||
@ -564,6 +565,8 @@
|
||||
script_file: "~/.rally/extra/instance_test.sh"
|
||||
interpreter: "/bin/sh"
|
||||
username: "cirros"
|
||||
volume_args:
|
||||
size: 2
|
||||
runner:
|
||||
type: "constant"
|
||||
times: {{smoke or 4}}
|
||||
@ -576,6 +579,40 @@
|
||||
sla:
|
||||
failure_rate:
|
||||
max: 0
|
||||
-
|
||||
args:
|
||||
flavor:
|
||||
name: {{flavor_name}}
|
||||
image:
|
||||
name: {{image_name}}
|
||||
floating_network: "public"
|
||||
command:
|
||||
script_inline: |
|
||||
time_seconds(){ (time -p $1 ) 2>&1 |awk '/real/{print $2}'; }
|
||||
file=/tmp/test.img
|
||||
c=100 #100M
|
||||
write_seq=$(time_seconds "dd if=/dev/zero of=$file bs=1M count=$c")
|
||||
read_seq=$(time_seconds "dd if=$file of=/dev/null bs=1M count=$c")
|
||||
[ -f $file ] && rm $file
|
||||
|
||||
echo "{
|
||||
\"write_seq\": $write_seq,
|
||||
\"read_seq\": $read_seq
|
||||
}"
|
||||
interpreter: "/bin/sh"
|
||||
username: "cirros"
|
||||
runner:
|
||||
type: "constant"
|
||||
times: 2
|
||||
concurrency: 2
|
||||
context:
|
||||
users:
|
||||
tenants: 1
|
||||
users_per_tenant: 1
|
||||
network: {}
|
||||
sla:
|
||||
failure_rate:
|
||||
max: 0
|
||||
|
||||
VMTasks.boot_runcommand_delete_custom_image:
|
||||
-
|
||||
|
@ -785,22 +785,6 @@
|
||||
failure_rate:
|
||||
max: 0
|
||||
|
||||
Authenticate.validate_heat:
|
||||
-
|
||||
args:
|
||||
repetitions: 2
|
||||
runner:
|
||||
type: "constant"
|
||||
times: 10
|
||||
concurrency: 5
|
||||
context:
|
||||
users:
|
||||
tenants: 3
|
||||
users_per_tenant: 5
|
||||
sla:
|
||||
failure_rate:
|
||||
max: 0
|
||||
|
||||
HttpRequests.check_request:
|
||||
-
|
||||
args:
|
||||
|
Loading…
x
Reference in New Issue
Block a user