diff options
| author |   Brian Freeman <bf1936@att.com> | 2019-10-11 13:55:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-10-11 13:55:15 +0000 |
| commit | 75dac00adaa8cd9e61e69687721fcbc8eb0d5e9a (patch) | |
| tree | 5109684ba83c4404c1634430c6c342349e65e522 | |
| parent | 5975b5e46ee11ddfafe42d9c8745d973b041ad9d (diff) | |
| parent | 0b76e728d2ef87fc2d85d644c8ca45cdc3f93645 (diff) | |
Merge "Fix deploy on failure of subproject" into elalto
| -rwxr-xr-x | kubernetes/helm/plugins/deploy/deploy.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/kubernetes/helm/plugins/deploy/deploy.sh b/kubernetes/helm/plugins/deploy/deploy.sh index 1622689386..3da189b908 100755 --- a/kubernetes/helm/plugins/deploy/deploy.sh +++ b/kubernetes/helm/plugins/deploy/deploy.sh @@ -140,13 +140,12 @@ deploy() { # actual upgrade/install of parent and subcharts. DEPLOY_FLAGS=$(resolve_deploy_flags "$FLAGS") - # determine if upgrading individual subchart or entire parent + subcharts + # determine if upgrading individual subchart or entire parent + subcharts SUBCHART_RELEASE="$(cut -d'-' -f2 <<<"$RELEASE")" - if [[ ! -d "$CACHE_SUBCHART_DIR/$SUBCHART_RELEASE" ]]; then + # update specified subchart without parent + RELEASE="$(cut -d'-' -f1 <<<"$RELEASE")" + if [[ $SUBCHART_RELEASE == $RELEASE ]]; then SUBCHART_RELEASE= - else - # update specified subchart without parent - RELEASE="$(cut -d'-' -f1 <<<"$RELEASE")" fi # clear previously cached charts |