summaryrefslogtreecommitdiffstats
path: root/k8s-bootstrap-container/bootstrap.sh
diff options
context:
space:
mode:
authorJack Lucas <jflucas@research.att.com>2018-08-22 19:29:40 +0000
committerJack Lucas <jflucas@research.att.com>2018-08-22 19:29:52 +0000
commit45cb899800a171a398238665009af73927969db0 (patch)
treeebcf1f9c6622bfe29bf36a4591475f977a622468 /k8s-bootstrap-container/bootstrap.sh
parentc6b1a01dcaa092662ce517b3aaeb2eec3443818d (diff)
Update CM to 18.7.23
Issue-ID: DCAEGEN2-619 Change-Id: I8140061d9358a99f2e13bb78facb15dbc77229a7 Signed-off-by: Jack Lucas <jflucas@research.att.com>
Diffstat (limited to 'k8s-bootstrap-container/bootstrap.sh')
-rwxr-xr-xk8s-bootstrap-container/bootstrap.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/k8s-bootstrap-container/bootstrap.sh b/k8s-bootstrap-container/bootstrap.sh
index fb092ce..2fe0cac 100755
--- a/k8s-bootstrap-container/bootstrap.sh
+++ b/k8s-bootstrap-container/bootstrap.sh
@@ -195,8 +195,9 @@ do
install_plugin ${wagon}
done
+# After this point, failures should not stop the script or block later commands
+trap - ERR
set +e
-# (Don't let failure of one stop the script. This is likely due to image pull taking too long.)
# Deploy platform components
# Allow for some parallelism to speed up the process. Probably could be somewhat more aggressive.
@@ -223,7 +224,6 @@ deploy prh k8s-prh.yaml &
# holmes_rules must be deployed before holmes_engine, but holmes_rules can go in parallel with other service components
deploy holmes_rules k8s-holmes-rules.yaml k8s-holmes_rules-inputs.yaml
deploy holmes_engine k8s-holmes-engine.yaml k8s-holmes_engine-inputs.yaml
-set -e
# Display deployments, for debugging purposes
cfy deployments list