From 3cb26f1c2f57e721f0f4aa238f3e431b19b48532 Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Wed, 22 Mar 2017 20:27:39 +0000 Subject: [PATCH] Use shorter timeout for update step The update step should take less time than the create step, and if we use the full create timeout then we will run past the gate timeout and get killed with no logs. Based on the current graphite metrics, all successful jobs are finishing update in under 45 minutes so that should be safe value. Change-Id: I0e9761c81b95fdf85c4f57daedb630a6e0cb9db2 Closes-Bug: 1674770 --- toci_gate_test-orig.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/toci_gate_test-orig.sh b/toci_gate_test-orig.sh index c3a4d8cf8..defc88d66 100755 --- a/toci_gate_test-orig.sh +++ b/toci_gate_test-orig.sh @@ -65,6 +65,8 @@ export OVERCLOUD=1 # the deploy. Hopefully that's enough, while still leaving some cushion to come # in under the gate timeout so we can collect logs. OVERCLOUD_DEPLOY_TIMEOUT=$((DEVSTACK_GATE_TIMEOUT-90)) +# NOTE(bnemec): Hard-coding this to 45 minutes based on current Graphite metrics +OVERCLOUD_UPDATE_TIMEOUT=45 export OVERCLOUD_SSH_USER=${OVERCLOUD_SSH_USER:-"jenkins"} export OVERCLOUD_DEPLOY_ARGS=${OVERCLOUD_DEPLOY_ARGS:-""} export OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS --libvirt-type=qemu -t $OVERCLOUD_DEPLOY_TIMEOUT -e /usr/share/openstack-tripleo-heat-templates/environments/debug.yaml" @@ -362,6 +364,9 @@ fi # If we're running an update job, regenerate the args to reflect the above changes if [ -n "$OVERCLOUD_UPDATE_ARGS" ]; then OVERCLOUD_UPDATE_ARGS="-e /usr/share/openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml $OVERCLOUD_DEPLOY_ARGS" + # We need a shorter timeout for the update step. 80 minutes puts us past + # the gate timeout in most cases. + OVERCLOUD_UPDATE_ARGS=$(echo "$OVERCLOUD_UPDATE_ARGS" | sed "s/-t $OVERCLOUD_DEPLOY_TIMEOUT/-t $OVERCLOUD_UPDATE_TIMEOUT/") fi TIMEOUT_SECS=$((DEVSTACK_GATE_TIMEOUT*60))