Merge pull request #3527 from trown/fail-delete-fails

openstack: Fail the job if `destroy cluster` fails
openshift · Apr 26, 2019 · 7557a2a · 7557a2a
2 parents 9f9a8f9 + aaa22f1
commit 7557a2a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml
@@ -498,12 +498,13 @@ objects:
 
           echo "Deprovisioning cluster ..."
           openshift-install --dir /tmp/artifacts/installer destroy cluster
+          DELETE_FAIL=$?
 
           echo "Nuking any resources left"
           nuke
         }
 
-        trap 'teardown' EXIT
+        trap 'teardown; exit $DELETE_FAIL' EXIT
         trap 'kill $(jobs -p); exit 0' TERM
 
         for i in $(seq 1 180); do