[ci] Write the XML files directly to ci-framework-data/tests/ (#271)

This removes the need to try copying the files around.
Update the source directory for custom_junit plugin outputs.

Author: elfiesmelfie

callback_plugins/custom_junit.py

@@ -18,7 +18,7 @@ def __init__(self):
 
         # Custom environment variable handling
         # Update this to parse these values from the config file, as well as the env.
-        self._output_dir = os.path.expanduser("~/.ansible.log")
+        self._output_dir = os.path.expanduser("~/ci-framework-data/tests/feature-verification-tests/")
         self._test_case_prefix = os.getenv('JUNIT_TEST_CASE_PREFIX', 'TEST')
         self._fail_on_ignore = 'true'  # this is needed because we use "ignore_errors" on the playbooks so that all the tests are run
         self._include_setup_tasks_in_report = os.getenv('JUNIT_INCLUDE_SETUP_TASKS_IN_REPORT', 'False').lower()

ci/report_result.yml

@@ -1,5 +1,5 @@
 ---
-- name: "Create the output files"
+- name: "Create the output directory"
   hosts:
      - controller
   vars_files:
@@ -22,7 +22,7 @@
     - name: "Find the XML file(s)"
       ansible.builtin.shell:
         cmd: |
-          find {{ custom_xml_output_dir }} -name *.xml
+          find {{ logs_dir }} -name *.xml
       register: xml_file_list
       ignore_errors: true
 
@@ -31,7 +31,7 @@
         var: xml_file_list.stdout_lines
       ignore_errors: true
 
-    - name: "Collect the XML files, renaming them for the host that they are collected from"
+    - name: "Copy the XML files"
       delegate_to: controller
       ansible.builtin.copy:
         remote_src: true
@@ -68,7 +68,7 @@
     - name: "Get the matching lines in the results files"
       ansible.builtin.command:
        cmd: |
-         grep -r "<testsuites .*>$" {{ custom_xml_output_dir }}/
+         grep -r "<testsuites .*>$" {{ logs_dir }}/
       register: verbose_matches
       ignore_errors: true
 

ci/vars/common.yml

@@ -1,4 +1,3 @@
 ---
 fvt_dir: "{{ ansible_env.HOME }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}"
-logs_dir: "{{ ansible_env.HOME }}/ci-framework-data/logs/feature-verification-tests"
-custom_xml_output_dir: "~/.ansible.log/"
+logs_dir: "{{ ansible_env.HOME }}/ci-framework-data/tests/feature-verification-tests"

roles/common/tasks/crd_tests.yml

@@ -8,9 +8,8 @@
 
 - name: |
     TEST Verify CRD {{ item }} is found
-    {{ common_crd_test_id }}
   ansible.builtin.assert:
     that:
       - "'NotFound' not in output.stderr"
     success_msg: "CRD {{ item }} is found."
-    fail_msg: "CRD {{ item }} not found. Error: {{ output.stderr }}"
+    fail_msg: "CRD {{ item }} not found. Error: {{ output.stderr }}"