Merge "Add per-build ssh key to base job"

2017-07-10 14:53:18 +00:00 · 2017-07-10 14:53:18 +00:00 · af20354a12
commit af20354a12
parent 985e1c9dba 84dc1318c1
6 changed files with 9 additions and 5 deletions
--- a/playbooks/base-test/post.yaml
+++ b/playbooks/base-test/post.yaml
@ -1,3 +1,2 @@
 - hosts: all
-  roles:
-    - remove-build-sshkey
+  roles: []
--- a/playbooks/base-test/pre.yaml
+++ b/playbooks/base-test/pre.yaml
@ -1,3 +1,2 @@
 - hosts: all
-  roles:
-    - add-build-sshkey
+  roles: []
--- a/playbooks/base/post-logs.yaml
+++ b/playbooks/base/post-logs.yaml
--- a/playbooks/base/post-ssh.yaml
+++ b/playbooks/base/post-ssh.yaml
@ -0,0 +1,3 @@
+- hosts: all
+    roles:
+      - remove-build-sshkey
--- a/playbooks/base/pre.yaml
+++ b/playbooks/base/pre.yaml
@ -1,4 +1,5 @@
 - hosts: all
  roles:
+    - add-build-sshkey
    - prepare-workspace
    - openstack-info
--- a/zuul.yaml
+++ b/zuul.yaml
@ -27,7 +27,9 @@
      It also sets default timeout and nodeset values (which may be
      overidden).
    pre-run: playbooks/base/pre
-    post-run: playbooks/base/post
+    post-run:
+      - playbooks/base/post-ssh
+      - playbooks/base/post-logs
    roles:
      - zuul: openstack-infra/openstack-zuul-roles
    # TODO(jeblair): This will only work for our current 6 digit