diff --git a/roles/fetch-subunit-output/tasks/process.yaml b/roles/fetch-subunit-output/tasks/process.yaml index 71edd0aef..4556afc40 100644 --- a/roles/fetch-subunit-output/tasks/process.yaml +++ b/roles/fetch-subunit-output/tasks/process.yaml @@ -16,15 +16,10 @@ - testrepository.subunit register: subunit_files -- name: Compress subunit files - archive: - path: "{{ item.path }}" - with_items: "{{ subunit_files.files }}" - - name: Collect test-results synchronize: dest: "{{ zuul.executor.log_root }}" mode: pull - src: "{{ item.path }}.gz" + src: "{{ item.path }}" verify_host: true with_items: "{{ subunit_files.files }}" diff --git a/test-playbooks/base-roles/fetch-subunit-output.yaml b/test-playbooks/base-roles/fetch-subunit-output.yaml index 580191feb..cd2e4cdd5 100644 --- a/test-playbooks/base-roles/fetch-subunit-output.yaml +++ b/test-playbooks/base-roles/fetch-subunit-output.yaml @@ -45,14 +45,14 @@ - name: Check that the testrepository file has been pulled delegate_to: localhost file: - path: "{{ zuul.executor.log_root }}/testrepository.subunit.gz" + path: "{{ zuul.executor.log_root }}/testrepository.subunit" state: file register: local_subunit_file - name: Check that HTML test result file has been pulled delegate_to: localhost file: - path: "{{ zuul.executor.log_root }}/testr_results.html.gz" + path: "{{ zuul.executor.log_root }}/testr_results.html" state: file register: local_html_test_results @@ -70,10 +70,10 @@ shell: | GLOBAL_RESULT=1 zgrep -q -E 'subunit_tests.test_working.WorkingTest.test_success$' \ - {{ zuul.executor.log_root }}/testr_results.html.gz + {{ zuul.executor.log_root }}/testr_results.html T1=$? zgrep -q -E 'subunit_tests.test_failing.FailingTest.test_failure.*_StringException:' \ - {{ zuul.executor.log_root }}/testr_results.html.gz + {{ zuul.executor.log_root }}/testr_results.html T2=$? if [ ${T1} -eq 0 ] && [ ${T2} -ne 0 ]; then GLOBAL_RESULT=0 @@ -92,14 +92,14 @@ - name: Check that the testrepository file has been pulled delegate_to: localhost file: - path: "{{ zuul.executor.log_root }}/testrepository.subunit.gz" + path: "{{ zuul.executor.log_root }}/testrepository.subunit" state: file register: local_subunit_file - name: Check that HTML test result file has been pulled delegate_to: localhost file: - path: "{{ zuul.executor.log_root }}/testr_results.html.gz" + path: "{{ zuul.executor.log_root }}/testr_results.html" state: file register: local_html_test_results @@ -116,10 +116,10 @@ shell: | GLOBAL_RESULT=1 zgrep -q -E 'subunit_tests.test_working.WorkingTest.test_success$' \ - {{ zuul.executor.log_root }}/testr_results.html.gz + {{ zuul.executor.log_root }}/testr_results.html T1=$? zgrep -q -E 'subunit_tests.test_failing.FailingTest.test_failure.*_StringException:' \ - {{ zuul.executor.log_root }}/testr_results.html.gz + {{ zuul.executor.log_root }}/testr_results.html T2=$? if [ ${T1} -eq 0 ] && [ ${T2} -eq 0 ]; then GLOBAL_RESULT=0