Merge "Set REMAINING_TIME for local run"
This commit is contained in:
commit
0cd2cafbd0
@ -75,6 +75,7 @@ pushd $TRIPLEO_ROOT/tripleo-quickstart/
|
||||
|
||||
# Use $REMAINING_TIME of infra to calculate maximum time for remaning part of job
|
||||
# Leave 15 minutes for quickstart logs collection
|
||||
REMAINING_TIME=${REMAINING_TIME:-180}
|
||||
TIME_FOR_DEPLOY=$(( REMAINING_TIME - ($(date +%s) - START_JOB_TIME)/60 - 15 ))
|
||||
/usr/bin/timeout --preserve-status ${TIME_FOR_DEPLOY}m $TRIPLEO_ROOT/tripleo-quickstart/quickstart.sh --bootstrap --no-clone \
|
||||
-t all \
|
||||
|
@ -158,6 +158,7 @@ sudo ip link add ci-dummy type dummy
|
||||
|
||||
# Use $REMAINING_TIME of infra to calculate maximum time for remaning part of job
|
||||
# Leave 10 minutes for postci function
|
||||
REMAINING_TIME=${REMAINING_TIME:-180}
|
||||
TIME_FOR_DEPLOY=$(( REMAINING_TIME - ($(date +%s) - START_JOB_TIME)/60 - 10 ))
|
||||
/usr/bin/timeout --preserve-status ${TIME_FOR_DEPLOY}m $TRIPLEO_ROOT/tripleo-ci/scripts/deploy.sh
|
||||
if [[ $CACHEUPLOAD == 1 && can_promote ]] ; then
|
||||
|
@ -112,6 +112,7 @@ cp -f $TE_DATAFILE ~/instackenv.json
|
||||
|
||||
# Use $REMAINING_TIME of infra to calculate maximum time for remaning part of job
|
||||
# Leave 10 minutes for postci function
|
||||
REMAINING_TIME=${REMAINING_TIME:-180}
|
||||
TIME_FOR_DEPLOY=$(( REMAINING_TIME - ($(date +%s) - START_JOB_TIME)/60 - 10 ))
|
||||
/usr/bin/timeout --preserve-status ${TIME_FOR_DEPLOY}m $TRIPLEO_ROOT/tripleo-ci/scripts/deploy.sh
|
||||
|
||||
|
@ -64,6 +64,7 @@ $QUICKSTART_PREPARE_CMD
|
||||
|
||||
# Use $REMAINING_TIME of infra to calculate maximum time for remaning part of job
|
||||
# Leave 15 minutes for quickstart logs collection
|
||||
REMAINING_TIME=${REMAINING_TIME:-180}
|
||||
TIME_FOR_DEPLOY=$(( REMAINING_TIME - ($(date +%s) - START_JOB_TIME)/60 - 15 ))
|
||||
/usr/bin/timeout --preserve-status ${TIME_FOR_DEPLOY}m $QUICKSTART_INSTALL_CMD \
|
||||
2>&1 | tee $LOGS_DIR/quickstart_install.log && exit_value=0 || exit_value=$?
|
||||
|
Loading…
Reference in New Issue
Block a user