Skip to content

Commit cce04e6

Browse files
Move post-processing outside block/rescue so results are reported even on test failure
1 parent e8657d9 commit cce04e6

1 file changed

Lines changed: 19 additions & 17 deletions

File tree

collection/stages/roles/cpms_test/tasks/run_cpms_test.yml

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,6 @@
2424
ARTIFACT_DIR: "{{ cpms_results_subdir }}"
2525
changed_when: true
2626

27-
- name: Rename JUnit XML to match expected prefix
28-
ansible.builtin.copy:
29-
src: "{{ cpms_results_subdir }}/{{ cpms_test_junit_filename }}"
30-
dest: "{{ cpms_results_subdir }}/junit_e2e_{{ cpms_tests_type }}.xml"
31-
remote_src: yes
32-
mode: u=rw,g=rw,o=r
33-
34-
- name: Post openshift-test
35-
ansible.builtin.include_role:
36-
name: tools_openshift_tests
37-
tasks_from: post_openshift_tests.yml
38-
vars:
39-
testsuite_name: "{{ cpms_test_testsuite_name }}_{{ cpms_tests_type }}"
40-
key_for_filtering_results: "cpms"
41-
test_name: "{{ cpms_test_name }}-{{ cpms_tests_type }}"
42-
results_dir: "{{ cpms_results_subdir }}"
43-
4427
rescue:
4528
- name: Mark the CPMS {{ cpms_tests_type }} tests as UNSTABLE
4629
ansible.builtin.include_role:
@@ -55,3 +38,22 @@
5538
name: tools_must-gather
5639
vars:
5740
must_gather_suffix: "cpms-{{ cpms_tests_type }}"
41+
42+
- name: Rename JUnit XML to match expected prefix
43+
ansible.builtin.copy:
44+
src: "{{ cpms_results_subdir }}/{{ cpms_test_junit_filename }}"
45+
dest: "{{ cpms_results_subdir }}/junit_e2e_{{ cpms_tests_type }}.xml"
46+
remote_src: yes
47+
mode: u=rw,g=rw,o=r
48+
when: cpms_results_subdir + '/' + cpms_test_junit_filename is file
49+
50+
- name: Post openshift-test
51+
ansible.builtin.include_role:
52+
name: tools_openshift_tests
53+
tasks_from: post_openshift_tests.yml
54+
vars:
55+
testsuite_name: "{{ cpms_test_testsuite_name }}_{{ cpms_tests_type }}"
56+
key_for_filtering_results: "cpms"
57+
test_name: "{{ cpms_test_name }}-{{ cpms_tests_type }}"
58+
results_dir: "{{ cpms_results_subdir }}"
59+
when: cpms_results_subdir + '/' + cpms_test_junit_filename is file

0 commit comments

Comments
 (0)