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: I4e8772e697dbb98e8adfa4f8693c3ff71bf02ba1
This commit is contained in:
parent
4c7aa7ea35
commit
81d7ce1f09
3
playbooks/base-test/cleanup.yaml
Normal file
3
playbooks/base-test/cleanup.yaml
Normal file
@ -0,0 +1,3 @@
|
||||
- hosts: all
|
||||
roles:
|
||||
- remove-build-sshkey
|
@ -1,10 +1,3 @@
|
||||
- hosts: all
|
||||
roles:
|
||||
- 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
|
||||
|
3
playbooks/base/cleanup.yaml
Normal file
3
playbooks/base/cleanup.yaml
Normal file
@ -0,0 +1,3 @@
|
||||
- hosts: all
|
||||
roles:
|
||||
- remove-build-sshkey
|
@ -1,10 +1,3 @@
|
||||
- hosts: all
|
||||
roles:
|
||||
- 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
|
||||
|
@ -11,6 +11,7 @@
|
||||
It also sets a default timeout value (which may be overidden).
|
||||
pre-run: playbooks/base/pre.yaml
|
||||
post-run: playbooks/base/post.yaml
|
||||
cleanup-run: playbooks/base/cleanup.yaml
|
||||
roles:
|
||||
- zuul: opendev.org/zuul/zuul-jobs
|
||||
timeout: 1800
|
||||
@ -23,6 +24,7 @@
|
||||
main job in production. Not for general use.
|
||||
pre-run: playbooks/base-test/pre.yaml
|
||||
post-run: playbooks/base-test/post.yaml
|
||||
cleanup-run: playbooks/base-test/cleanup.yaml
|
||||
roles:
|
||||
- zuul: opendev.org/zuul/zuul-jobs
|
||||
timeout: 1800
|
||||
|
Loading…
Reference in New Issue
Block a user