openstack
/
trove
Code Issues Proposed changes

Improve Gate: address multiple issues relative to timing 

This commit merges two commits, 447750[1] and 448630[2] in the fond
hope that this will improve the odds of its being able to merge.

The log operation test assumes that the log will be Ready but in some
cases, Partial is also a valid result. Add that into the list of
allowed results.

In addition, this change aims to support cases where test suites last
much more than 1 hour and where a token can expire unexpectedly mid
operation. This is by no means a 'fix' for the bug here, just a way to
get the gate to be more stable.

[1] https://review.openstack.org/447750
[2] https://review.openstack.org/448630

Change-Id: Ib888dd55f04952139508a7cb0fee60e192e1b77c
Closes-Bug: 1674520
Partial-Fix: 1674510
This commit is contained in:
Amrith Kumar 2017-03-22 12:21:20 -04:00
parent 4998becb4d
commit c84f5cce14
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devstack/plugin.sh
View File

@ -99,6 +99,14 @@ function iniset_conditional {
fi
}
# configure_keystone_token_life() - update the keystone token life to 3h
function configure_keystone_token_life() {
KEYSTONE_CONF_DIR=${KEYSTONE_CONF_DIR:-/etc/nova}
KEYSTONE_CONF=${KEYSTONE_CONF:-${KEYSTONE_CONF_DIR}/keystone.conf}
KEYSTONE_TOKEN_LIFE=${KEYSTONE_TOKEN_LIFE:-10800}
iniset $KEYSTONE_CONF token expiration ${KEYSTONE_TOKEN_LIFE}
echo "configure_keystone_token_life: setting keystone token life to ${KEYSTONE_TOKEN_LIFE}"
}
# configure_nova_kvm() - update the nova hypervisor configuration if possible
function configure_nova_kvm {
@ -136,6 +144,7 @@ function configure_trove {
setup_develop $TROVE_DIR
configure_nova_kvm
configure_keystone_token_life
# Create the trove conf dir and cache dirs if they don't exist
sudo install -d -o $STACK_USER ${TROVE_CONF_DIR} ${TROVE_AUTH_CACHE_DIR}

3
trove/tests/scenario/runners/guest_log_runners.py
View File

@ -694,7 +694,8 @@ class GuestLogRunner(TestRunner):
self.admin_client,
log_name,
expected_type=guest_log.LogType.SYS.name,
expected_status=guest_log.LogStatus.Ready.name,
expected_status=[guest_log.LogStatus.Ready.name,
guest_log.LogStatus.Partial.name],
expected_published=0, expected_pending=1)
def run_test_log_publish_sys(self):