diff --git a/roles/polarion/tasks/main.yml b/roles/polarion/tasks/main.yml index 5d144511e5..5063437b89 100644 --- a/roles/polarion/tasks/main.yml +++ b/roles/polarion/tasks/main.yml @@ -94,20 +94,13 @@ ansible.builtin.debug: var: pylero_output.stdout_lines - - name: Look for test result directories in artifacts directory - ansible.builtin.find: - paths: "{{ cifmw_polarion_jump_result_dir }}" - recurse: false - file_type: directory - register: result_dirs - - name: Merge result XML files of each directory ansible.builtin.shell: chdir: "{{ cifmw_polarion_jump_result_dir }}" cmd: >- source "{{ cifmw_polarion_jump_repo_dir }}/jump-venv/bin/activate" && - junitparser merge {{ item.path }}/*.xml {{item.path }}/results_merged.xml - loop: "{{ result_dirs.files }}" + junitparser merge {{ item.path | dirname }}/*.xml {{item.path | dirname }}/results_merged.xml + loop: "{{ xml_files.files }}" - name: Look for test result XML files in artifacts directory ansible.builtin.find: @@ -126,7 +119,7 @@ --testrun-title={{ cifmw_polarion_testrun_title }}-{{ loop_idx }} --xml-file={{ item.path }} --update_testcases={{ cifmw_polarion_update_testcases | default(false) }} - --custom-fields cijoburl={{ cifmw_zuul_url }}/{{ zuul.build }},jobteststage={{ result_dirs.files[ loop_idx ].path | basename }} + --custom-fields cijoburl={{ cifmw_zuul_url }}/{{ zuul.build }},jobteststage={{ merged_xml_files.files[ loop_idx ].path | dirname | basename }} {{ cifmw_polarion_jump_extra_vars | default ('') }} loop: "{{ merged_xml_files.files }}" loop_control: