Set timeout without wait

This PS fixes this_chart_should_wait value do not be set True when
user change timeout value.

In SKT CI pipeline, all charts are deployed parallely
(NOT sequentially) so needs more time to deploy than default 900.

But when use --timeout param to change timeout, charts waits
sequentially so can not deploy parallely.

Change-Id: Ibf67c0f98bf2a05b0369ebca68780efb94c4d709
This commit is contained in:
DaeSeong Kim 2018-07-29 22:44:14 -07:00
parent def8704c5f
commit 0a5b74440c
1 changed files with 8 additions and 1 deletions

View File

@ -345,8 +345,15 @@ class Armada(object):
wait_timeout = deprecated_timeout or wait_timeout
# Determine wait logic
# NOTE(Dan Kim): Conditions to wait are below :
# 1) set sequenced=True in chart group
# 2) set force_wait param
# 3) add Chart's `data.wait.timeout`
# --timeout param will do not set wait=True, it just change
# max timeout of chart's deployment. (default: 900)
this_chart_should_wait = (cg_sequenced or self.force_wait or
wait_timeout > 0)
(bool(wait_values) and
(wait_timeout > 0)))
# If there is still no timeout, we need to use a default
# (item 4 in note above)