openstack
/
tripleo-ci
Code Issues Proposed changes

Remove 10 minutes reserved for logs for multinode 

After https://review.openstack.org/#/c/527844/ is merged
we don't need to save 10 minutes for logs anymore.
Remove this time from timeout command for quickstart running.

Change-Id: If60280ca19a2ed8d4730f605f5ce9114c907f9ec
This commit is contained in:
Sagi Shnaidman 2018-01-08 21:21:34 +02:00
parent ef0dd1b1b1
commit 89a7c9b0c8
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/oooq_common_functions.sh
View File

@ -38,8 +38,12 @@ function run_with_timeout {
JOB_TIME=$1
shift
COMMAND=$@
# Leave 10 minutes for quickstart logs collection
RESERVED_LOG_TIME=10
# Leave 10 minutes for quickstart logs collection for ovb only
if [[ "$TOCI_JOBTYPE" =~ "ovb" ]]; then
RESERVED_LOG_TIME=10
else
RESERVED_LOG_TIME=0
fi
# Use $REMAINING_TIME of infra to calculate maximum time for remaining part of job
REMAINING_TIME=${REMAINING_TIME:-180}
TIME_FOR_COMMAND=$(( REMAINING_TIME - ($(date +%s) - JOB_TIME)/60 - $RESERVED_LOG_TIME))