diff --git a/.zuul.yaml b/.zuul.yaml index 9a7b55c658..bb58ba1e13 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1408,6 +1408,7 @@ run: playbooks/zuul/run-production-playbook.yaml vars: ansible_forks: 5 + infra_prod_playbook_collect_log: true nodeset: nodes: [] diff --git a/playbooks/zuul/run-production-playbook.yaml b/playbooks/zuul/run-production-playbook.yaml index f21dc215e1..d91d131a07 100644 --- a/playbooks/zuul/run-production-playbook.yaml +++ b/playbooks/zuul/run-production-playbook.yaml @@ -15,6 +15,31 @@ - hosts: bridge.openstack.org tasks: - - name: Run specified playbook on bridge.o.o + - name: Log a playbook start header become: yes - command: ansible-playbook -f {{ ansible_forks }} /opt/system-config/playbooks/{{ playbook_name }} + shell: 'echo "Running {{ ansible_date_time.iso8601 }}: ansible-playbook -v -f {{ ansible_forks }} /opt/system-config/playbooks/{{ playbook_name }}" > /var/log/ansible/{{ playbook_name }}.log' + + - name: Run specified playbook on bridge.o.o and redirect output + become: yes + shell: 'ansible-playbook -v -f {{ ansible_forks }} /opt/system-config/playbooks/{{ playbook_name }} >> /var/log/ansible/{{ playbook_name }}.log' + + # Not using normal zuul job roles as bridge.openstack.org is not a + # test node with all the normal bits in place. + - name: Collect log output + synchronize: + dest: "{{ zuul.executor.log_root }}/{{ playbook_name }}.log" + mode: pull + src: "/var/log/ansible/{{ playbook_name }}.log" + verify_host: true + when: infra_prod_playbook_collect_log + + - name: Return playbook log artifact to Zuul + when: infra_prod_playbook_collect_log + zuul_return: + data: + zuul: + artifacts: + - name: "Playbook Log" + url: "{{ playbook_name }}.log" + metadata: + type: text