Merge "Do not run stage-output again in Tempest"
diff --git a/.zuul.yaml b/.zuul.yaml
index f2ca000..b5cda87 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -10,6 +10,19 @@
vars:
devstack_services:
tempest: true
+ test_results_stage_name: 'test_results'
+ zuul_copy_output:
+ '{{ devstack_base_dir }}/tempest/etc/tempest.conf': 'logs'
+ '{{ devstack_base_dir }}/tempest/etc/accounts.yaml': 'logs'
+ '{{ devstack_base_dir }}/tempest/tempest.log': 'logs'
+ '{{ stage_dir }}/{{ test_results_stage_name }}.subunit': 'logs'
+ '{{ stage_dir }}/{{ test_results_stage_name }}.html': 'logs'
+ '{{ stage_dir }}/stackviz': 'logs'
+ extensions_to_txt:
+ conf: True
+ log: True
+ yaml: True
+ yml: True
run: playbooks/devstack-tempest.yaml
post-run: playbooks/post-tempest.yaml
diff --git a/playbooks/post-tempest.yaml b/playbooks/post-tempest.yaml
index 70dac09..ab7a1bb 100644
--- a/playbooks/post-tempest.yaml
+++ b/playbooks/post-tempest.yaml
@@ -1,23 +1,7 @@
- hosts: all
become: true
- vars:
- logs_root: "{{ devstack_base_dir|default('/opt/stack') }}"
- test_results_stage_name: 'test_results'
roles:
- role: process-test-results
- test_results_dir: '{{ logs_root }}/tempest'
+ test_results_dir: '{{ devstack_base_dir }}/tempest'
tox_envdir: tempest
- role: process-stackviz
- - role: stage-output
- zuul_copy_output:
- { '{{ logs_root }}/tempest/etc/tempest.conf': 'logs',
- '{{ logs_root }}/tempest/etc/accounts.yaml': 'logs',
- '{{ logs_root }}/tempest/tempest.log': 'logs',
- '{{ stage_dir }}/{{ test_results_stage_name }}.subunit': 'logs',
- '{{ stage_dir }}/{{ test_results_stage_name }}.html': 'logs',
- '{{ stage_dir }}/stackviz': 'logs' }
- extensions_to_txt:
- - conf
- - log
- - yaml
- - yml