Remove ssh key in base cleanup run.

If the builds ssh key is removed during post run no cleanup
actions can be made on remote hosts by jobs inheriting from
the base job. It also causes problems with ssh keys
not being removed for static nodes when jobs are aborted.

Change-Id: Id751e8a842ed0d03e605dcd0620c388c3d7f973b
This commit is contained in:
vass 2020-04-06 20:24:22 +02:00
parent ee6e77a30c
commit a9f6ab15e3
3 changed files with 4 additions and 7 deletions

View File

@ -0,0 +1,3 @@
- hosts: all
roles:
- remove-build-sshkey

View File

@ -1,10 +1,3 @@
- hosts: all - hosts: all
roles: roles:
- fetch-output - fetch-output
- hosts: all
# NOTE(pabelanger): We ignore_errors for the following tasks as not to fail
# successful jobs.
ignore_errors: yes
roles:
- remove-build-sshkey

View File

@ -11,6 +11,7 @@
It also sets a default timeout value (which may be overidden). It also sets a default timeout value (which may be overidden).
pre-run: playbooks/base/pre.yaml pre-run: playbooks/base/pre.yaml
post-run: playbooks/base/post.yaml post-run: playbooks/base/post.yaml
cleanup-run: playbooks/base/cleanup.yaml
roles: roles:
- zuul: opendev.org/zuul/zuul-jobs - zuul: opendev.org/zuul/zuul-jobs
timeout: 1800 timeout: 1800