From b661ed81913e8bb00ed4b109bd06cdfffdadf7a7 Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Tue, 14 Aug 2018 09:54:11 -0400 Subject: [PATCH] If install succeeds, guarantee we grab output even if it doesn't stabilize We can still handle teardown log gathering even if router / api isn't 100% stable --- ci-operator/templates/cluster-launch-installer-e2e.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ci-operator/templates/cluster-launch-installer-e2e.yaml b/ci-operator/templates/cluster-launch-installer-e2e.yaml index 2ff5e2e8cb8f..2c9042e22a11 100644 --- a/ci-operator/templates/cluster-launch-installer-e2e.yaml +++ b/ci-operator/templates/cluster-launch-installer-e2e.yaml @@ -209,6 +209,7 @@ objects: while true; do if [[ -f /tmp/exit ]]; then echo "Interrupted" + cp $KUBECONFIG /tmp/admin.kubeconfig exit 1 fi if [[ ! -f /tmp/oc ]]; then @@ -228,9 +229,13 @@ objects: fi break done - /tmp/oc wait deploy/router -n tectonic-ingress --for condition=available --timeout=5m - echo "Copied kubeconfig, installation successful" + if ! /tmp/oc wait deploy/router -n tectonic-ingress --for condition=available --timeout=5m; then + echo "Installation failed" + cp $KUBECONFIG /tmp/admin.kubeconfig + exit 1 + fi cp $KUBECONFIG /tmp/admin.kubeconfig + echo "Installation successful" # Performs cleanup of all created resources - name: teardown