openstack
/
tripleo-ci
Code Issues Proposed changes

Bump tempest version to latest 

Update pinning of tempest to the latest version in upstream,
fix configuration scripts for it.

Change-Id: Ic0671c536a1a41a93ee2e6c43bd7398c4ce09cdd
This commit is contained in:
Sagi Shnaidman 2016-08-15 23:59:41 +03:00
parent 77cf38c1e2
commit 4fd0e7baba
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/config_tempest.py
View File

@ -57,9 +57,9 @@ from tempest.lib.services.compute import servers_client
from tempest.lib.services.image.v2 import images_client
from tempest.lib.services.network import networks_client
from tempest.services.identity.v2.json import identity_client
from tempest.services.identity.v2.json import roles_client
from tempest.services.identity.v2.json import tenants_client
from tempest.services.identity.v2.json import users_client
from tempest.lib.services.identity.v2 import roles_client
from tempest.lib.services.identity.v2 import tenants_client
from tempest.lib.services.identity.v2 import users_client
from tempest.services.identity.v3.json \
import identity_client as identity_v3_client
@ -513,7 +513,7 @@ def give_role_to_user(tenants_client, roles_client, users_client, username,
return
role_id = role_ids[0]
try:
roles_client.assign_user_role(tenant_id, user_id, role_id)
roles_client.create_user_role_on_project(tenant_id, user_id, role_id)
LOG.debug("User '%s' was given the '%s' role in project '%s'",
username, role_name, tenant_name)
except exceptions.Conflict:
@ -709,7 +709,8 @@ def create_tempest_networks(clients, conf, has_neutron, public_network_id):
"Please note that any test that relies on external "
"connectivity would most likely fail.")
conf.set('network', 'public_network_id', public_network_id)
if public_network_id is not None:
conf.set('network', 'public_network_id', public_network_id)
else:
client = clients.get_nova_net_client()

4
scripts/default-overrides.conf
View File

@ -106,6 +106,10 @@ lock_path=/tmp
# Added in kilo
bootable=true
# It needs to be true since mitaka
# this option expected to be removed after liberty EOL
volume_services=true
[compute-feature-enabled]
# Default deployment does not use shared storage
live_migration=false

2
scripts/tripleo.sh
View File

@ -147,7 +147,7 @@ TEMPEST_RUN=${TEMPEST_RUN:-""}
TEMPEST_ARGS=${TEMPEST_ARGS:-"--parallel --subunit"}
TEMPEST_ADD_CONFIG=${TEMPEST_ADD_CONFIG:-}
TEMPEST_REGEX=${TEMPEST_REGEX:-"^(?=(.*smoke))(?!(tempest.api.orchestration.stacks|tempest.scenario.test_volume_boot_pattern|tempest.api.telemetry))"}
TEMPEST_PINNED="fb77374ddeeb1642bffa086311d5f281e15142b2"
TEMPEST_PINNED="95854ce727846110f3fc2946f3ed48f0ad189a2f"
SSH_OPTIONS=${SSH_OPTIONS:-'-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=Verbose -o PasswordAuthentication=no -o ConnectionAttempts=32'}
export SCRIPTS_DIR=$(dirname ${BASH_SOURCE[0]:-$0})
OPSTOOLS_REPO_ENABLED=${OPSTOOLS_REPO_ENABLED:-"0"}