1. devstack
  2. Commit a904caded4269039a087292a8b7b95eb2de21142
Browse code

Move zuul_copy_output to be a job variable

The zuul_copy_output variable is designed to be able to be used as
a zuul job variable so that zuul dictionary merging will work. However,
it's currently being set in the playbook rather than as a job variable,
so it's not possible to supplement it in a child job.

Move it to be a job variable. Also remove the wrapping {} as they should
not be needed to make zuul_copy_output a dictionary.

Change-Id: I78c7fed47c2ab868384c74dbff7904d33d510dd9

Monty Taylor authored on 2018/01/23 07:18:55
Showing 2 changed files
.zuul.yaml
History View file @ a904cad
... ... 
@@ -77,6 +77,40 @@
77 77 
       devstack_services:
78 78 
         horizon: false
79 79 
         tempest: false
80 
+      zuul_copy_output:
81 
+        '{{ devstack_conf_dir }}/local.conf': 'logs'
82 
+        '{{ devstack_conf_dir }}/localrc': 'logs'
83 
+        '{{ devstack_conf_dir }}/.stackenv': 'logs'
84 
+        '{{ devstack_log_dir }}/dstat-csv.log': 'logs'
85 
+        '{{ devstack_log_dir }}/devstacklog.txt': 'logs'
86 
+        '{{ devstack_log_dir }}/devstacklog.txt.summary': 'logs'
87 
+        '{{ devstack_full_log}}': 'logs'
88 
+        '{{ stage_dir }}/verify_tempest_conf.log': 'logs'
89 
+        '{{ stage_dir }}/apache': 'logs'
90 
+        '{{ stage_dir }}/apache_config': 'logs'
91 
+        '{{ stage_dir }}/etc': 'logs'
92 
+        '/var/log/rabbitmq': 'logs'
93 
+        '/var/log/postgresql': 'logs'
94 
+        '/var/log/mysql.err': 'logs'
95 
+        '/var/log/mysql.log': 'logs'
96 
+        '/var/log/libvirt': 'logs'
97 
+        '/etc/sudoers': 'logs'
98 
+        '/etc/sudoers.d': 'logs'
99 
+        '{{ stage_dir }}/iptables.txt': 'logs'
100 
+        '{{ stage_dir }}/df.txt': 'logs'
101 
+        '{{ stage_dir }}/pip2-freeze.txt': 'logs'
102 
+        '{{ stage_dir }}/pip3-freeze.txt': 'logs'
103 
+        '{{ stage_dir }}/dpkg-l.txt': 'logs'
104 
+        '{{ stage_dir }}/rpm-qa.txt': 'logs'
105 
+        '{{ stage_dir }}/core': 'logs'
106 
+        '{{ stage_dir }}/listen53.txt': 'logs'
107 
+        '{{ stage_dir }}/deprecations.log': 'logs'
108 
+        '/var/log/ceph': 'logs'
109 
+        '/var/log/openvswitch': 'logs'
110 
+        '/var/log/glusterfs': 'logs'
111 
+        '/etc/glusterfs/glusterd.vol': 'logs'
112 
+        '/etc/resolv.conf': 'logs'
113 
+        '/var/log/unbound.log': 'logs'
80 114 
     pre-run: playbooks/pre.yaml
81 115 
     run: playbooks/devstack.yaml
82 116 
     post-run: playbooks/post.yaml
playbooks/post.yaml
History View file @ a904cad
... ... 
@@ -24,40 +24,6 @@
24 24 
     # capture-system-logs should be the last role before stage-output
25 25 
     - capture-system-logs
26 26 
     - role: stage-output
27 
-      zuul_copy_output:
28 
-        { '{{ devstack_conf_dir }}/local.conf': 'logs',
29 
-          '{{ devstack_conf_dir }}/localrc': 'logs',
30 
-          '{{ devstack_conf_dir }}/.stackenv': 'logs' ,
31 
-          '{{ devstack_log_dir }}/dstat-csv.log': 'logs',
32 
-          '{{ devstack_log_dir }}/devstacklog.txt': 'logs',
33 
-          '{{ devstack_log_dir }}/devstacklog.txt.summary': 'logs',
34 
-          '{{ devstack_full_log}}': 'logs',
35 
-          '{{ stage_dir }}/verify_tempest_conf.log': 'logs',
36 
-          '{{ stage_dir }}/apache': 'logs',
37 
-          '{{ stage_dir }}/apache_config': 'logs',
38 
-          '{{ stage_dir }}/etc': 'logs',
39 
-          '/var/log/rabbitmq': 'logs',
40 
-          '/var/log/postgresql': 'logs',
41 
-          '/var/log/mysql.err': 'logs',
42 
-          '/var/log/mysql.log': 'logs',
43 
-          '/var/log/libvirt': 'logs',
44 
-          '/etc/sudoers': 'logs',
45 
-          '/etc/sudoers.d': 'logs',
46 
-          '{{ stage_dir }}/iptables.txt': 'logs',
47 
-          '{{ stage_dir }}/df.txt': 'logs',
48 
-          '{{ stage_dir }}/pip2-freeze.txt': 'logs',
49 
-          '{{ stage_dir }}/pip3-freeze.txt': 'logs',
50 
-          '{{ stage_dir }}/dpkg-l.txt': 'logs',
51 
-          '{{ stage_dir }}/rpm-qa.txt': 'logs',
52 
-          '{{ stage_dir }}/core': 'logs',
53 
-          '{{ stage_dir }}/listen53.txt': 'logs',
54 
-          '{{ stage_dir }}/deprecations.log': 'logs',
55 
-          '/var/log/ceph': 'logs',
56 
-          '/var/log/openvswitch': 'logs',
57 
-          '/var/log/glusterfs': 'logs',
58 
-          '/etc/glusterfs/glusterd.vol': 'logs',
59 
-          '/etc/resolv.conf': 'logs',
60 
-          '/var/log/unbound.log': 'logs' }
61 27 
       extensions_to_txt:
62 28 
         - conf
63 29 
         - log