summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2019-01-07 14:04:56 +0000
committerMonty Taylor <mordred@inaugust.com>2019-01-09 17:49:44 +0000
commitb95f12ed8f6d5b2eab430685d76f55c7eb672c1e (patch)
treeca725c88cfea1060ab014680f78810489e77dd57
parente78dab260bb1a5925f6a175d6d88397ac614bac3 (diff)
Add fetch-output to base jobs
This change was added in OpenStack's base job as part of the effort to provide a standard interface on the remote nodes into which logs can be put regardless of how they are eventually going to be uploaded. Change-Id: I07f1a88f357c68d3deeadf7f12b1b77fc4a948f4
Notes
Notes (review): Code-Review+2: Tobias Henkel <tobias.henkel@bmw.de> Code-Review+2: Andreas Jaeger <jaegerandi@gmail.com> Workflow+1: Andreas Jaeger <jaegerandi@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 10 Jan 2019 20:52:24 +0000 Reviewed-on: https://review.openstack.org/628975 Project: openstack-infra/zuul-base-jobs Branch: refs/heads/master
-rw-r--r--playbooks/base-test/post.yaml (renamed from playbooks/base-test/post-ssh.yaml)4
-rw-r--r--playbooks/base/post.yaml (renamed from playbooks/base/post-ssh.yaml)4
-rw-r--r--zuul.yaml4
3 files changed, 10 insertions, 2 deletions
diff --git a/playbooks/base-test/post-ssh.yaml b/playbooks/base-test/post.yaml
index d793838..a021a08 100644
--- a/playbooks/base-test/post-ssh.yaml
+++ b/playbooks/base-test/post.yaml
@@ -1,3 +1,7 @@
1- hosts: all 1- hosts: all
2 roles: 2 roles:
3 - fetch-output
4
5- hosts: all
6 roles:
3 - remove-build-sshkey 7 - remove-build-sshkey
diff --git a/playbooks/base/post-ssh.yaml b/playbooks/base/post.yaml
index d793838..a021a08 100644
--- a/playbooks/base/post-ssh.yaml
+++ b/playbooks/base/post.yaml
@@ -1,3 +1,7 @@
1- hosts: all 1- hosts: all
2 roles: 2 roles:
3 - fetch-output
4
5- hosts: all
6 roles:
3 - remove-build-sshkey 7 - remove-build-sshkey
diff --git a/zuul.yaml b/zuul.yaml
index 9aaa6d7..b16f321 100644
--- a/zuul.yaml
+++ b/zuul.yaml
@@ -10,7 +10,7 @@
10 10
11 It also sets a default timeout value (which may be overidden). 11 It also sets a default timeout value (which may be overidden).
12 pre-run: playbooks/base/pre.yaml 12 pre-run: playbooks/base/pre.yaml
13 post-run: playbooks/base/post-ssh.yaml 13 post-run: playbooks/base/post.yaml
14 roles: 14 roles:
15 - zuul: git.zuul-ci.org/zuul-jobs 15 - zuul: git.zuul-ci.org/zuul-jobs
16 timeout: 1800 16 timeout: 1800
@@ -22,7 +22,7 @@
22 A job to test changes to the base job without disturbing the 22 A job to test changes to the base job without disturbing the
23 main job in production. Not for general use. 23 main job in production. Not for general use.
24 pre-run: playbooks/base-test/pre.yaml 24 pre-run: playbooks/base-test/pre.yaml
25 post-run: playbooks/base-test/post-ssh.yaml 25 post-run: playbooks/base-test/post.yaml
26 roles: 26 roles:
27 - zuul: git.zuul-ci.org/zuul-jobs 27 - zuul: git.zuul-ci.org/zuul-jobs
28 timeout: 1800 28 timeout: 1800