openstack
/
trove
Code Issues Proposed changes

Fix gate issues 

NOTE(mriedem/smatzek): This is a squash of two commits.

The first commit message is:

Jobs run as jenkins on Zuul v2 but run as user zuul on Zuul v3.

NOTE(mriedem): This is only taking one specific fix from the large
change on master (queens) since we don't need the other changes
for stable/pike to fix the gate.

(cherry picked from commit 9ec134996a)

This is the 2nd commit message:

Increase 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.

NOTE(smatzek): This is only taking one fix from this change as
the other is N/A in this case as it was enabling the disabled
integration tests.

(cherry picked from commit d7b773d2b0)

Change-Id: Ic55187b0d73d4c572d7f8332882b4f455a6177c8
(cherry picked from commit e6d4b4b3fe)
This commit is contained in:
Samuel Matzek 2017-10-14 08:12:00 -05:00
parent 898d364fdf
commit 1c032c6fb7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/settings
View File

@ -36,7 +36,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}

6
integration/scripts/trovestack
View File

@ -1275,7 +1275,7 @@ function cmd_dsvm_gate_tests() {
local DATASTORE_TYPE=${1:-'mysql'}
local TEST_GROUP=${2:-${DATASTORE_TYPE}}
local HOST_SCP_USERNAME=${3:-'jenkins'}
local HOST_SCP_USERNAME=${3:-$USER}
local GUEST_USERNAME=${4:-'ubuntu'}
local CONTROLLER_IP=${5:-$ACTUAL_HOSTNAME}
local ESCAPED_PATH_TROVE=${6:-'\/opt\/stack\/new\/trove'}
@ -1314,8 +1314,8 @@ function cmd_dsvm_gate_tests() {
export TROVE_REPORT_DIR=$HOME/dsvm-report/
TROVESTACK_DUMP_ENV=true
# Devstack vm-gate runs as the jenkins user, but needs to connect to the guest image as ubuntu
echo "User=ubuntu" >> /home/jenkins/.ssh/config
# Devstack vm-gate runs as a non-ubuntu user, but needs to connect to the guest image as ubuntu
echo "User=ubuntu" >> /home/$USER/.ssh/config
# Fix iptables rules that prevent amqp connections from the devstack box to the guests
sudo iptables -D openstack-INPUT -j REJECT --reject-with icmp-host-prohibited || true