diff options
| author | Samuel Matzek <smatzek@us.ibm.com> | 2017-10-14 08:12:00 -0500 |
|---|---|---|
| committer | Samuel Matzek <smatzek@us.ibm.com> | 2017-10-19 06:23:16 -0500 |
| commit | d7b773d2b07f0c95909ef73c4644a63f09fd82c3 (patch) | |
| tree | 8f49a9d68c44a352d015aebdc24223bb7b131cbb /devstack/settings | |
| parent | c4c0083f2660504a6de3a0f8937d8265d5f2bede (diff) | |
| download | trove-d7b773d2b07f0c95909ef73c4644a63f09fd82c3.tar.gz | |
Enable integration tests9.0.0.0b1
Re-enable the integration tests.
Integration tests were temporarily disabled under
9ec134996a1162de0d74ef915dc138bbacbcfdf1 to avoid the
circular dependency with python-troveclient and allow
the merging of the python-troveclient changes necessary
to complete the fixing of the gates.
This also increases the TROVE_AGENT_CALL_HIGH_TIMEOUT to
help the upgrade test pass. The upgrade test has an agent call
that takes longer than the current timeout when running in
the gate on Nova compute with virt_type set as qemu.
Change-Id: I8459cd64cdf6107e537f4e7c793c3626fa4bf9f9
Diffstat (limited to 'devstack/settings')
| -rw-r--r-- | devstack/settings | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/devstack/settings b/devstack/settings index 0495b04e..9d926c6d 100644 --- a/devstack/settings +++ b/devstack/settings @@ -35,7 +35,7 @@ TROVE_MAX_ACCEPTED_VOLUME_SIZE=${TROVE_MAX_ACCEPTED_VOLUME_SIZE} TROVE_MAX_INSTANCES_PER_TENANT=${TROVE_MAX_INSTANCES_PER_TENANT} TROVE_MAX_VOLUMES_PER_TENANT=${TROVE_MAX_VOLUMES_PER_TENANT} TROVE_AGENT_CALL_LOW_TIMEOUT=${TROVE_AGENT_CALL_LOW_TIMEOUT} -TROVE_AGENT_CALL_HIGH_TIMEOUT=${TROVE_AGENT_CALL_HIGH_TIMEOUT} +TROVE_AGENT_CALL_HIGH_TIMEOUT=${TROVE_AGENT_CALL_HIGH_TIMEOUT:-1200} TROVE_RESIZE_TIME_OUT=${TROVE_RESIZE_TIME_OUT} TROVE_USAGE_TIMEOUT=${TROVE_USAGE_TIMEOUT} TROVE_STATE_CHANGE_WAIT_TIME=${TROVE_STATE_CHANGE_WAIT_TIME} |