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-10-25 13:37:19 -0500
commite6d4b4b3fe1768348c9df815940b97cecb5e7ee2 (patch)
treec1621459135960415894c1530ac8a76bf7c1de32
parent0fb67d459baa0fb22391b1b1da3dba5349666bb7 (diff)
Fix gate issuesstable/pike
NOTE(mriedem): This is a squash of four 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: Update .gitreview for stable/pike This is the 3rd commit message: Update UPPER_CONSTRAINTS_FILE for stable/pike This is the 4th 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
Notes
Notes (review): Code-Review+2: Amrith Kumar <amrith.kumar@gmail.com> Code-Review+2: Sean McGinnis <sean.mcginnis@gmail.com> Workflow+1: Sean McGinnis <sean.mcginnis@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Sat, 28 Oct 2017 04:53:30 +0000 Reviewed-on: https://review.openstack.org/514710 Project: openstack/trove Branch: refs/heads/stable/pike
-rw-r--r--.gitreview1
-rw-r--r--devstack/settings2
-rwxr-xr-xintegration/scripts/trovestack6
-rw-r--r--tox.ini2
4 files changed, 6 insertions, 5 deletions
diff --git a/.gitreview b/.gitreview
index 459f3c4..3d07874 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
2host=review.openstack.org 2host=review.openstack.org
3port=29418 3port=29418
4project=openstack/trove.git 4project=openstack/trove.git
5defaultbranch=stable/pike
diff --git a/devstack/settings b/devstack/settings
index 02632a6..0da3a06 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 69e8149..5b7ba6b 100755
--- a/integration/scripts/trovestack
+++ b/integration/scripts/trovestack
@@ -1291,7 +1291,7 @@ function cmd_dsvm_gate_tests() {
1291 1291
1292 local DATASTORE_TYPE=${1:-'mysql'} 1292 local DATASTORE_TYPE=${1:-'mysql'}
1293 local TEST_GROUP=${2:-${DATASTORE_TYPE}} 1293 local TEST_GROUP=${2:-${DATASTORE_TYPE}}
1294 local HOST_SCP_USERNAME=${3:-'jenkins'} 1294 local HOST_SCP_USERNAME=${3:-$USER}
1295 local GUEST_USERNAME=${4:-'ubuntu'} 1295 local GUEST_USERNAME=${4:-'ubuntu'}
1296 local CONTROLLER_IP=${5:-$ACTUAL_HOSTNAME} 1296 local CONTROLLER_IP=${5:-$ACTUAL_HOSTNAME}
1297 local ESCAPED_PATH_TROVE=${6:-'\/opt\/stack\/new\/trove'} 1297 local ESCAPED_PATH_TROVE=${6:-'\/opt\/stack\/new\/trove'}
@@ -1330,8 +1330,8 @@ function cmd_dsvm_gate_tests() {
1330 export TROVE_REPORT_DIR=$HOME/dsvm-report/ 1330 export TROVE_REPORT_DIR=$HOME/dsvm-report/
1331 TROVESTACK_DUMP_ENV=true 1331 TROVESTACK_DUMP_ENV=true
1332 1332
1333 # Devstack vm-gate runs as the jenkins user, but needs to connect to the guest image as ubuntu 1333 # Devstack vm-gate runs as a non-ubuntu user, but needs to connect to the guest image as ubuntu
1334 echo "User=ubuntu" >> /home/jenkins/.ssh/config 1334 echo "User=ubuntu" >> /home/$USER/.ssh/config
1335 1335
1336 # Fix iptables rules that prevent amqp connections from the devstack box to the guests 1336 # Fix iptables rules that prevent amqp connections from the devstack box to the guests
1337 sudo iptables -D openstack-INPUT -j REJECT --reject-with icmp-host-prohibited || true 1337 sudo iptables -D openstack-INPUT -j REJECT --reject-with icmp-host-prohibited || true
diff --git a/tox.ini b/tox.ini
index 4b29469..22001a3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@ setenv = VIRTUAL_ENV={envdir}
8 PYTHONWARNINGS=default::DeprecationWarning 8 PYTHONWARNINGS=default::DeprecationWarning
9usedevelop = True 9usedevelop = True
10install_command = pip install \ 10install_command = pip install \
11 -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} \ 11 -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike} \
12 -U {opts} {packages} 12 -U {opts} {packages}
13deps = -r{toxinidir}/requirements.txt 13deps = -r{toxinidir}/requirements.txt
14 -r{toxinidir}/test-requirements.txt 14 -r{toxinidir}/test-requirements.txt