[ci] Fix our jobs

* port exisiting_users job to keystone v3
* add keystone v3 support to functional job
* remove novanetwork scenarios from gates(it looks like devstack guys
  switched to neutron by default)
* temporary turn off samples and certification task check
* add requirements of oslo.db[fixtures] to our test-requirements to
  fix unit test failures
* turn off "GlanceImages.create_image_and_boot_instances" failed scenario

Change-Id: I6e61cf98744d68adbab390c6b213b209932a3508
This commit is contained in:
Andrey Kurilin 2016-12-01 21:07:38 +02:00
parent 1e83e3e3db
commit e4f3a4b8ea
4 changed files with 39 additions and 91 deletions

View File

@ -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:
@ -728,38 +728,6 @@
failure_rate:
max: 0
NovaNetworks.create_and_list_networks:
-
args:
start_cidr: "10.10.0.0/24"
runner:
type: "constant"
times: 5
concurrency: 2
context:
users:
tenants: 3
users_per_tenant: 2
sla:
failure_rate:
max: 0
NovaNetworks.create_and_delete_network:
-
args:
start_cidr: "10.10.0.0/24"
runner:
type: "constant"
times: 5
concurrency: 2
context:
users:
tenants: 3
users_per_tenant: 2
sla:
failure_rate:
max: 0
SwiftObjects.list_and_download_objects_in_containers:
-
runner:

View File

@ -1050,38 +1050,6 @@
failure_rate:
max: 0
NovaNetworks.create_and_list_networks:
-
args:
start_cidr: "10.10.0.0/24"
runner:
type: "constant"
times: 5
concurrency: 2
context:
users:
tenants: 3
users_per_tenant: 2
sla:
failure_rate:
max: 0
NovaNetworks.create_and_delete_network:
-
args:
start_cidr: "10.10.0.0/24"
runner:
type: "constant"
times: 5
concurrency: 2
context:
users:
tenants: 3
users_per_tenant: 2
sla:
failure_rate:
max: 0
SwiftObjects.list_and_download_objects_in_containers:
-
runner:

View File

@ -23,3 +23,6 @@ testtools>=1.4.0
oslosphinx>=4.7.0 # Apache Software License
oslotest>=1.10.0 # Apache Software License
testresources>=0.2.4 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD

View File

@ -37,13 +37,18 @@ function setUp () {
# NOTE(ikhudoshyn): Create additional users and register a new env
# so that we could run scenarios using 'existing_users' context
if [ "$DEVSTACK_GATE_PREPOPULATE_USERS" = "1" ]; then
# NOTE(andreykurilin): let's hardcode version, since we already
# hardcoded arguments for users...
export OS_IDENTITY_API_VERSION=3
openstack --version
openstack --os-interface admin project create rally-test-project-1
openstack --os-interface admin user create --project rally-test-project-1 --password rally-test-password-1 rally-test-user-1
openstack project create rally-test-project-1
openstack user create --project rally-test-project-1 --password rally-test-password-1 rally-test-user-1
openstack role add --project rally-test-project-1 --user rally-test-user-1 Member
openstack --os-interface admin project create rally-test-project-2
openstack --os-interface admin user create --project rally-test-project-2 --password rally-test-password-2 rally-test-user-2
openstack project create rally-test-project-2
openstack user create --project rally-test-project-2 --password rally-test-password-2 rally-test-user-2
openstack role add --project rally-test-project-2 --user rally-test-user-2 Member
set +e
NEUTRON_EXISTS=$(openstack --os-interface admin service list | grep neutron)
@ -63,12 +68,16 @@ function setUp () {
{\
"username": "rally-test-user-1",\
"password": "rally-test-password-1",\
"tenant_name": "rally-test-project-1",\
"project_name": "rally-test-project-1",\
"user_domain_name": "Default",\
"project_domain_name": "Default"\
},\
{\
"username": "rally-test-user-2",\
"password": "rally-test-password-2",\
"tenant_name": "rally-test-project-2"\
"project_name": "rally-test-project-2",\
"user_domain_name": "Default",\
"project_domain_name": "Default"\
}\
],\
' $DEPLOYMENT_CONFIG_FILE