diff options
| -rw-r--r-- | devstack/settings | 2 | ||||
| -rwxr-xr-x | integration/scripts/trovestack | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/devstack/settings b/devstack/settings index be3074f4..33120bee 100644 --- a/devstack/settings +++ b/devstack/settings @@ -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} diff --git a/integration/scripts/trovestack b/integration/scripts/trovestack index c9e43b80..5a75031a 100755 --- a/integration/scripts/trovestack +++ b/integration/scripts/trovestack @@ -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 |