Merge branch 'master' into efoley/update_manifest_tests

Author: elfiesmelfie

.github/workflows/lint.yml

@@ -10,4 +10,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Run ansible-lint
-        uses: ansible-community/ansible-lint-action@main
+        uses: ansible/[email protected]
+        with:
+          args: "-c ./.ansible-lint"
+

.zuul.yaml

@@ -96,6 +96,7 @@
     description: |
       Run the UI Graphing test and tempest smoketests on osp18.
     vars:
+      crc_enable_monitoring: true
       cifmw_extras:
         - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/ci-framework'].src_dir  }}/scenarios/centos-9/multinode-ci.yml"
         - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/vars-autoscaling.yml"
@@ -121,6 +122,7 @@
         - functional-autoscaling-tests-osp18:
             files:
               - roles/telemetry_autoscaling/.*
+              - roles/common/*
               - .zuul.yaml
               - ci/vars-functional-test.yml
               - ci/run_cloudops_tests_osp18.yml
@@ -134,6 +136,7 @@
             irrelevant-files: *irrelevant_files
             files:
               - roles/telemetry_logging/.*
+              - roles/common/*
               - .zuul.yaml
               - ci/vars-logging-test.yml
               - ci/logging_tests_all.yml

callback_plugins/custom_junit.py

@@ -6,6 +6,44 @@
 import re
 from ansible.utils._junit_xml import TestCase, TestError, TestFailure, TestSuite, TestSuites
 
+DOCUMENTATION = '''
+    callback: custom_junit
+    type: notification
+    short_description: TODO
+    description:
+      custom_junit generates an XML files that Polarion can read.
+      Only the tasks marked with $test_case_prefix are reported.
+      The first line of the task name (excluding the prefix_ is converted
+      to snake_case, and this becomes the testcase name in the results file.
+    options:
+      test_case_prefix:
+        description: todo
+        ini:
+          - section: custom_junit
+            key: test_case_prefix
+        env:
+          - name: JUNIT_TEST_CASE_PREFIX
+        default: "TEST"
+        type: string
+      classname:
+        description: The classname for the tests.
+        ini:
+          - section: custom_junit
+            key: classname
+        env:
+          - name: CUSTOM_JUNIT_CLASSNAME
+        default: "openstack-observability"
+        type: string
+      output_dir:
+        description: the direcory which the output files are saved to
+        ini:
+          - section: custom_junit
+            key: output_dir
+        env:
+          - name: JUNIT_OUTPUT_DIR
+        default: "~/ci-framework-data/tests/feature-verification-tests/"
+        type: path
+'''
 
 class CallbackModule(JunitCallbackModule):
     """
@@ -14,12 +52,15 @@ class CallbackModule(JunitCallbackModule):
     CALLBACK_NAME = 'custom_junit'
 
     def __init__(self):
+        self._defs = None
         super(CallbackModule, self).__init__()
+        self.set_options()
 
-        # 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._test_case_prefix = os.getenv('JUNIT_TEST_CASE_PREFIX', 'TEST')
+        self._output_dir = self.get_option("output_dir")
+        self._test_case_prefix = self.get_option("test_case_prefix")
+        self._classname = self.get_option("classname")
+
         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()
         self._hide_task_arguments = os.getenv('JUNIT_HIDE_TASK_ARGUMENTS', 'True').lower()
@@ -104,5 +145,5 @@ def _build_test_case(self, task_data, host_data):
         # system_err elements that show STDOUT and STDERR
         tc.system_out = None
         tc.system_err = None
-        tc.classname = "openstack-observability"
+        tc.classname = self._classname
         return tc

ci/patch-openstack-versions.yaml

@@ -1,11 +1,11 @@
 spec:
   customContainerImages:
-    aodhAPIImage: quay.io/podified-master-centos9/openstack-aodh-api:current-podified
-    aodhEvaluatorImage: quay.io/podified-master-centos9/openstack-aodh-evaluator:current-podified
-    aodhListenerImage: quay.io/podified-master-centos9/openstack-aodh-listener:current-podified
-    aodhNotifierImage: quay.io/podified-master-centos9/openstack-aodh-notifier:current-podified
-    ceilometerCentralImage: quay.io/podified-master-centos9/openstack-ceilometer-central:current-podified
-    ceilometerComputeImage: quay.io/podified-master-centos9/openstack-ceilometer-compute:current-podified
-    heatAPIImage: quay.io/podified-master-centos9/openstack-heat-api:current-podified
-    heatCfnapiImage: quay.io/podified-master-centos9/openstack-heat-api-cfn:current-podified
-    heatEngineImage: quay.io/podified-master-centos9/openstack-heat-engine:current-podified
+    aodhAPIImage: quay.rdoproject.org/podified-master-centos10/openstack-aodh-api:current-tested
+    aodhEvaluatorImage: quay.rdoproject.org/podified-master-centos10/openstack-aodh-evaluator:current-tested
+    aodhListenerImage: quay.rdoproject.org/podified-master-centos10/openstack-aodh-listener:current-tested
+    aodhNotifierImage: quay.rdoproject.org/podified-master-centos10/openstack-aodh-notifier:current-tested
+    ceilometerCentralImage: quay.rdoproject.org/podified-master-centos10/openstack-ceilometer-central:current
+    ceilometerComputeImage: quay.rdoproject.org/podified-master-centos10/openstack-ceilometer-compute:current
+    heatAPIImage: quay.rdoproject.org/podified-master-centos10/openstack-heat-api:current-tested
+    heatCfnapiImage: quay.rdoproject.org/podified-master-centos10/openstack-heat-api-cfn:current-tested
+    heatEngineImage: quay.rdoproject.org/podified-master-centos10/openstack-heat-engine:current-tested

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/run_graphing_test.yml

@@ -5,11 +5,14 @@
   environment:
     KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
     PATH: "{{ cifmw_path }}"
+  vars:
+    USERNAME: "{{ cifmw_openshift_user }}"
+    PASSWORD: "{{ cifmw_openshift_password }}"
   vars_files:
     - vars/common.yml
   tasks:
     - block:
         - name: "Run Graphing Console UI tests"
           ansible.builtin.import_role:
             name: telemetry_graphing
-          ignore_errors: true
+          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"

meta/runtime.yml

@@ -1,2 +1,2 @@
 ---
-requires_ansible: '>=2.9.10'
+requires_ansible: '>=2.15.0'

roles/common/README.md

@@ -26,8 +26,6 @@ Variable required for all tasks to run
 
 For pod_tests.yml tasks:
 
-    common_pod_test_id
-      - polarion ID number for each test.
     common_pod_list
       - list of pods to validate
     common_pod_status_str
@@ -38,63 +36,47 @@ For pod_tests.yml tasks:
 
 For subscription_tests.yml tasks:
 
-    common_subscription_test_id
-      - polarion ID number for each test
     common_subscription_nspace
       - namespace
     common_subscription_list
       - list of subscription to validate
 
 For crd_tests.yml tasks:
 
-    common_crd_test_id
-      - polarion ID number for each test.
     common_crd_list
       - list of crd to validate
 
 For endpoint_tests.yml tasks:
 
-    common_endpoint_test_id
-      - polarion ID number for each test.
     common_endpoint_list
       - list of endpoints to validate
     openstack_cmd
       - The command used to run openstack
 
 For project_tests.yml tasks:
 
-    common_project_test_id
-      - polarion ID number for each test
     common_project_list
       - list of projects to validate
 
 For service_tests.yml tasks:
 
-    common_service_test_id
-      - polarion ID number for each test
     common_service_nspace
       - namespace
     common_service_list
       - list of services to validate
 
 For file_tests.yml tasks:
 
-    common_file_test_id
-      - polarion ID number for each test
     common_file_list
       - list of files to validate
 
 For manifest_tests.yml tasks:
 
-     manifest_test_id
-       - polarion ID number for each test
      manifest_list
        - list of package manifests to validate
 
 For cr\_tests.yml tasks:
 
-    common\_cr\_test\_id is defined
-       - polarion ID number for each test that a CR exists
     common\_cr\_list is defined
        - list of CRs to check
         Each dict should include the following keys: kind, name
@@ -103,8 +85,6 @@ For cr\_tests.yml tasks:
            kind: metricstorage
            name: metric-storage
            condition\_type: Ready
-    common\_cr\_ready\_test\_id is optionally defined
-       - polarion ID number for each test of readiness of the CR
 
 
 
@@ -132,7 +112,6 @@ can be set at the play level.
         ansible.builtin.import_role:
           name: common
         vars:
-          common_pod_test_id: "RHOSO-12752"
           common_pod_status_str: "Running"
           common_pod_nspace: openstack
           common_pod_list:
@@ -142,7 +121,6 @@ can be set at the play level.
         ansible.builtin.import_role:
           name: common
         vars:
-          common_subscription_test_id: "RHOSO-12678"
           common_subscription_nspace: openshift-operators-redhat
           common_subscription_l :
             - loki-operator
@@ -151,7 +129,6 @@ can be set at the play level.
         ansible.builtin.include_role:
           name: common
         vars:
-            common_container_test_id: "RHOSO-12753"
             common_container_list:
                 - ceilometer_agent_compute
                 - ceilometer_agent_ipmi
@@ -163,7 +140,6 @@ can be set at the play level.
         ansible.builtin.import_role:
           name: common
         vars:
-          common_endpoint_test_id: "RHOSO-12682"
           common_endpoint_list:
             - [nova,compute,public]
             - [nova,compute,internal]
@@ -173,7 +149,6 @@ can be set at the play level.
         ansible.builtin.import_role:
           name: common
         vars:
-          common_project_test_id: "RHOSO-12668"
           common_project_list:
             - openshift-openstack-infra
             - openshift
@@ -182,7 +157,6 @@ can be set at the play level.
         ansible.builtin.import_role:
           name: common
         vars:
-          common_service_test_id: "RHOSO-12675"
           common_service_nspace: openshift-logging
           common_service_list:
             - cluster-logging-operator-metrics
@@ -207,15 +181,13 @@ can be set at the play level.
         ansible.builtin.import_role:
           name: common
         vars:
-          common_file_test_id: "RHOSO-12754"
           common_file_list:
             - /etc/rsyslog.d/10-telemetry.conf
 
       - name: "Verify crd"
         ansible.builtin.import_role:
           name: common
         vars:
-          common_crd_test_id : "crd_test_id"
           common_crd_list:
             - list of crd to validate
 

roles/common/defaults/main.yml

@@ -1,14 +1,2 @@
 ---
-openstack_cmd: "openstack"
-
-common_crd_test_id: "RHOSO-XXXX"
-common_cr_test_id: "RHOSO-XXXX"
-common_cr_ready_test_id: "RHOSO-XXXX"
-common_container_test_id: "RHOSO-XXXX"
-common_endpoint_test_id: "RHOSO-XXXX"
-common_file_test_id: "RHOSO-XXXX"
-common_manifest_test_id: "RHOSO-XXXX"
-common_pod_test_id: "RHOSO-XXXX"
-common_project_test_id: "RHOSO-XXXX"
-common_service_test_id: "RHOSO-XXXX"
-common_subscription_test_id: "RHOSO-XXXX"
+openstack_cmd: "openstack"