Remove hardcoding of overcloud deploy timeout
Now overcloud deploy timeout is derived from DEVSTACK_GATE_TIMEOUT which is always 170 and equal to 80. It's not appropriate for all jobs. It will be calculated dynamically depending on how much time remains in the job for deployment. Pass end time of CI job to ansible playbook for calculating it. Partial-Bug: #1738038 Change-Id: I89b743fc16ea4c100ba21ddbe29081fa3e5479e9
This commit is contained in:
parent
8c671f90db
commit
09f5854b34
@ -28,9 +28,6 @@ overcloud_templates_path: /usr/share/openstack-tripleo-heat-templates
|
||||
# Network
|
||||
# Deploy args
|
||||
flavor_args: ""
|
||||
|
||||
deploy_timeout: 110
|
||||
|
||||
# Images settings
|
||||
image_cache_dir: "{{ working_dir }}/images-cache"
|
||||
image_cache_dir_cleanup: true
|
||||
|
@ -119,10 +119,8 @@ export ENVIRONMENT=""
|
||||
export OVERCLOUD_HOSTS=
|
||||
export CONTROLLER_HOSTS=
|
||||
export SUBNODES_SSH_KEY=
|
||||
OVERCLOUD_DEPLOY_TIMEOUT=$((DEVSTACK_GATE_TIMEOUT-90))
|
||||
TIMEOUT_SECS=$((DEVSTACK_GATE_TIMEOUT*60))
|
||||
export EXTRA_VARS=${EXTRA_VARS:-""}
|
||||
export EXTRA_VARS="$EXTRA_VARS --extra-vars deploy_timeout=$OVERCLOUD_DEPLOY_TIMEOUT"
|
||||
export NODES_ARGS=""
|
||||
export COLLECT_CONF="$TRIPLEO_ROOT/tripleo-ci/toci-quickstart/config/collect-logs.yml"
|
||||
LOCAL_WORKING_DIR="$WORKSPACE/.quickstart"
|
||||
|
@ -86,7 +86,7 @@ export VIRTUAL_ENV_DISABLE_PROMPT=1
|
||||
source $LOCAL_WORKING_DIR/bin/activate
|
||||
source $OOOQ_DIR/ansible_ssh_env.sh
|
||||
|
||||
run_with_timeout $START_JOB_TIME $QUICKSTART_INSTALL_CMD \
|
||||
run_with_timeout $START_JOB_TIME $QUICKSTART_INSTALL_CMD --extra-vars ci_job_end_time=$(( START_JOB_TIME + REMAINING_TIME*60 )) \
|
||||
2>&1 | tee $LOGS_DIR/quickstart_install.log && exit_value=0 || exit_value=$?
|
||||
|
||||
# Print status of playbook run
|
||||
|
Loading…
Reference in New Issue
Block a user