Merge pull request #1179 from smarterclayton/installer_logs

If install succeeds, guarantee we grab output even if it doesn't stabilize
openshift · Aug 14, 2018 · e05d036 · e05d036
2 parents 1fc9df9 + b661ed8
commit e05d036
Showing 1 changed file with 7 additions and 2 deletions.
diff --git 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