summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Matzek <smatzek@us.ibm.com>2017-10-14 08:12:00 -0500
committerSamuel Matzek <smatzek@us.ibm.com>2017-11-01 11:31:08 -0500
commit1c032c6fb76928d6b1d06a724f9d84374418f354 (patch)
treeb4163c6a0727975da775490e93bd8ed85d1b383c
parent898d364fdf2cb6faad9735cdd01cba16b67f19b7 (diff)
Fix gate issuesstable/ocata
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 9ec134996a1162de0d74ef915dc138bbacbcfdf1) 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 d7b773d2b07f0c95909ef73c4644a63f09fd82c3) Change-Id: Ic55187b0d73d4c572d7f8332882b4f455a6177c8 (cherry picked from commit e6d4b4b3fe1768348c9df815940b97cecb5e7ee2)
Notes
Notes (review): Code-Review+1: Manoj Kumar <manoj@linux.vnet.ibm.com> Code-Review+1: jian.song <jian.song@easystack.cn> Code-Review+2: Matt Riedemann <mriedem.os@gmail.com> Workflow+1: Matt Riedemann <mriedem.os@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 17 Apr 2018 20:15:55 +0000 Reviewed-on: https://review.openstack.org/517037 Project: openstack/trove Branch: refs/heads/stable/ocata
-rw-r--r--devstack/settings2
-rwxr-xr-xintegration/scripts/trovestack6
2 files changed, 4 insertions, 4 deletions
diff --git a/devstack/settings b/devstack/settings
index be3074f..33120be 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -36,7 +36,7 @@ TROVE_MAX_ACCEPTED_VOLUME_SIZE=${TROVE_MAX_ACCEPTED_VOLUME_SIZE}
36TROVE_MAX_INSTANCES_PER_TENANT=${TROVE_MAX_INSTANCES_PER_TENANT} 36TROVE_MAX_INSTANCES_PER_TENANT=${TROVE_MAX_INSTANCES_PER_TENANT}
37TROVE_MAX_VOLUMES_PER_TENANT=${TROVE_MAX_VOLUMES_PER_TENANT} 37TROVE_MAX_VOLUMES_PER_TENANT=${TROVE_MAX_VOLUMES_PER_TENANT}
38TROVE_AGENT_CALL_LOW_TIMEOUT=${TROVE_AGENT_CALL_LOW_TIMEOUT} 38TROVE_AGENT_CALL_LOW_TIMEOUT=${TROVE_AGENT_CALL_LOW_TIMEOUT}
39TROVE_AGENT_CALL_HIGH_TIMEOUT=${TROVE_AGENT_CALL_HIGH_TIMEOUT} 39TROVE_AGENT_CALL_HIGH_TIMEOUT=${TROVE_AGENT_CALL_HIGH_TIMEOUT:-1200}
40TROVE_RESIZE_TIME_OUT=${TROVE_RESIZE_TIME_OUT} 40TROVE_RESIZE_TIME_OUT=${TROVE_RESIZE_TIME_OUT}
41TROVE_USAGE_TIMEOUT=${TROVE_USAGE_TIMEOUT} 41TROVE_USAGE_TIMEOUT=${TROVE_USAGE_TIMEOUT}
42TROVE_STATE_CHANGE_WAIT_TIME=${TROVE_STATE_CHANGE_WAIT_TIME} 42TROVE_STATE_CHANGE_WAIT_TIME=${TROVE_STATE_CHANGE_WAIT_TIME}
diff --git a/integration/scripts/trovestack b/integration/scripts/trovestack
index c9e43b8..5a75031 100755
--- a/integration/scripts/trovestack
+++ b/integration/scripts/trovestack
@@ -1275,7 +1275,7 @@ function cmd_dsvm_gate_tests() {
1275 1275
1276 local DATASTORE_TYPE=${1:-'mysql'} 1276 local DATASTORE_TYPE=${1:-'mysql'}
1277 local TEST_GROUP=${2:-${DATASTORE_TYPE}} 1277 local TEST_GROUP=${2:-${DATASTORE_TYPE}}
1278 local HOST_SCP_USERNAME=${3:-'jenkins'} 1278 local HOST_SCP_USERNAME=${3:-$USER}
1279 local GUEST_USERNAME=${4:-'ubuntu'} 1279 local GUEST_USERNAME=${4:-'ubuntu'}
1280 local CONTROLLER_IP=${5:-$ACTUAL_HOSTNAME} 1280 local CONTROLLER_IP=${5:-$ACTUAL_HOSTNAME}
1281 local ESCAPED_PATH_TROVE=${6:-'\/opt\/stack\/new\/trove'} 1281 local ESCAPED_PATH_TROVE=${6:-'\/opt\/stack\/new\/trove'}
@@ -1314,8 +1314,8 @@ function cmd_dsvm_gate_tests() {
1314 export TROVE_REPORT_DIR=$HOME/dsvm-report/ 1314 export TROVE_REPORT_DIR=$HOME/dsvm-report/
1315 TROVESTACK_DUMP_ENV=true 1315 TROVESTACK_DUMP_ENV=true
1316 1316
1317 # Devstack vm-gate runs as the jenkins user, but needs to connect to the guest image as ubuntu 1317 # Devstack vm-gate runs as a non-ubuntu user, but needs to connect to the guest image as ubuntu
1318 echo "User=ubuntu" >> /home/jenkins/.ssh/config 1318 echo "User=ubuntu" >> /home/$USER/.ssh/config
1319 1319
1320 # Fix iptables rules that prevent amqp connections from the devstack box to the guests 1320 # Fix iptables rules that prevent amqp connections from the devstack box to the guests
1321 sudo iptables -D openstack-INPUT -j REJECT --reject-with icmp-host-prohibited || true 1321 sudo iptables -D openstack-INPUT -j REJECT --reject-with icmp-host-prohibited || true