Make undercloud resources cleanup more robust
Currently if a job is aborted, job-specific undercloud resources might
not be deleted and kept forever.
This change makes it so that undercloud cleanup playbooks are now run
through the Zuul job's cleanup phase (cleanup-run [1]) instead of
post-run.
Additionally, make the cleanup tasks/playbooks carry on and not fail on
error.
[1]: https://zuul-ci.org/docs/zuul/latest/config/job.html#attr-job.cleanup-run
Change-Id: I92a6ce5c12aed9ac2504c815179ef4da0ecf9fe8
diff --git a/zuul.d/setup-juju-client.yaml b/zuul.d/setup-juju-client.yaml
index 0713595..a5d71a0 100644
--- a/zuul.d/setup-juju-client.yaml
+++ b/zuul.d/setup-juju-client.yaml
@@ -19,7 +19,7 @@
parent: base
description: Prepare hosts for Juju connections
pre-run: playbooks/setup-juju-client/pre.yaml
- post-run: playbooks/setup-juju-client/post.yaml
+ cleanup-run: playbooks/setup-juju-client/post.yaml
timeout: 1800
attempts: 3
secrets:
diff --git a/zuul.d/sp-cinder.yaml b/zuul.d/sp-cinder.yaml
index efd908d..f1c4aa7 100644
--- a/zuul.d/sp-cinder.yaml
+++ b/zuul.d/sp-cinder.yaml
@@ -118,7 +118,7 @@
- playbooks/setup-openstack-iscsi-multipath/pre.yaml
- playbooks/setup-openstack-iscsi-multipath-storpool/pre.yaml
run: playbooks/tempest-and-cinderlib-run.yaml
- post-run:
+ cleanup-run:
- playbooks/setup-openstack-iscsi-multipath-storpool/post.yaml
- playbooks/setup-openstack-iscsi-multipath/post.yaml
- playbooks/setup-openstack-client/post.yaml
@@ -228,7 +228,7 @@
- playbooks/setup-openstack-iscsi-multipath-storpool/pre.yaml
- playbooks/kolla-setup-openstack-iscsi-multipath-storpool/pre.yaml
run: playbooks/kolla-setup-openstack-iscsi-multipath-storpool/run.yaml
- post-run:
+ cleanup-run:
- playbooks/kolla-setup-openstack-iscsi-multipath-storpool/post.yaml
- playbooks/setup-openstack-iscsi-multipath-storpool/post.yaml
- playbooks/setup-openstack-iscsi-multipath/post.yaml