Add TODOs and pre-test steps

Author: elfiesmelfie

ci/ansible-tests-fvt.yaml

@@ -68,6 +68,8 @@ spec:
   #    A SELinuxLevel that should be used for test pods spawned by the test
   #    operator.
   #
+  # TODO: check this option in test-operator, since it only seems to support a sigle extra collection at the moment
+  # TODO: Correct this to requirements.yml instead of requirements.yaml (or support both)
   #  ansibleCollections	<string>
   #    AnsibleCollections - extra ansible collections to instal in additionn to the
   #    ones exist in the requirements.yaml
@@ -83,6 +85,7 @@ spec:
   #  ansiblePlaybookPath	<string> -required-
   #    AnsiblePlaybookPath - path to ansible playbook
   #
+  # TODO: If the repos from the hosts are copied into the extraMounts, we can skip using the ansibleVarFiles interface, and use ansibleExtraVars: @<file> instead.
   #  ansibleVarFiles	<string>
   #    AnsibleVarFiles - interface to create ansible var files Those get added to
   #    the
@@ -103,6 +106,9 @@ spec:
   #    Run ansible playbook with -vvvv
   #  extraConfigmapsMounts	<[]Object>
   #    Extra configmaps for mounting inside the pod
+  # TODO: Investigate preparing a PV and populating it with the git repos from the host.
+  # This would removed the need to install from galaxy and push to elfie/master in order to run a playbook.
+  # The git repos could then be cloned from the local copy of the repo.
   #
   #  extraMounts	<[]Object>
   #    ExtraMounts containing conf files, credentials and storage volumes
@@ -116,6 +122,7 @@ spec:
   #
   #  openStackConfigSecret	<string>
   #    OpenStackConfigSecret is the name of the Secret containing the secure.yaml
+  # TODO: add openstack config secrets, then skip running openstack commands in openstackclient. This also means that the version of promclient, observabilityclient and apdh client can be updated without patching the containers.
   #
   #  privileged	<boolean>
   #    Use with caution! This parameter specifies whether test-operator should

ci/logging_tests_all.yml

@@ -1,3 +1,7 @@
+- name: Run pre-test steps
+  ansible.builtin.import_playbook: pre-test-steps.yml
+
+
 - name: Run the compute node tests
   ansible.builtin.import_playbook: logging_tests_computes.yml
 

ci/pre-test-steps.yml

@@ -0,0 +1,31 @@
+- name: Run pre-test steps
+  ansible.builtin.import_playbook: pre-test-steps.yml
+
+- name: Run telemetry tests to verify metrics on osp18
+  hosts:  "{{ cifmw_target_hook_host | default('localhost')  }}"
+  gather_facts: true
+  environment:
+    KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
+    PATH: "{{ cifmw_path }}:/var/lib/ansible/bin"
+  vars_files:
+    - vars/common.yml
+    - vars/osp18_env.yml
+  tasks: 
+      #TODO: Add this as a common playbook so it can be added to the other tests as well.
+    - name: Install oc
+      ansible.builtin.include_role:
+        name: cifmw.general.ci_setup
+        tasks_from: packages
+      vars:
+        cifmw_ci_setup_packages: []
+
+    - name: Log into openshift
+      ansible.builtin.shell:
+        cmd: |
+          oc login -u {{ cifmw_openshift_user }} -p {{ cifmw_openshift_password }} --insecure-skip-tls-verify {{ cifmw_openshift_api }}
+      register: cmd
+      retries: 10
+      delay: 10
+      until: cmd.rc == 0
+
+

ci/run_autoscaling_tests.yml

@@ -1,4 +1,8 @@
 ---
+- name: Run pre-test steps
+  ansible.builtin.import_playbook: pre-test-steps.yml
+
+
 - name: Run telemetry autoscaling tests on osp18
   hosts:  "{{ cifmw_target_hook_host | default('localhost')  }}"
   gather_facts: true

ci/run_functional_tests.yml

@@ -1,3 +1,9 @@
+- name: Run pre-test steps
+  ansible.builtin.import_playbook: pre-test-steps.yml
+
+- name: Run Logging test
+  ansible.builtin.import_playbook: logging_tests_all.yml
+
 - name: Run Autoscaling test
   ansible.builtin.import_playbook: run_autoscaling_tests.yml
 

ci/run_graphing_test.yml

@@ -1,4 +1,8 @@
 ---
+- name: Run pre-test steps
+  ansible.builtin.import_playbook: pre-test-steps.yml
+
+
 - name: "Run functional test playbooks"
   hosts:  "{{ cifmw_target_hook_host | default('localhost')  }}"
   gather_facts: true
@@ -43,4 +47,4 @@
         - name: "Run Graphing Console UI tests"
           ansible.builtin.import_role:
             name: telemetry_graphing
-          ignore_errors: true
+          ignore_errors: true

ci/run_verify_metrics_osp18.yml

@@ -14,22 +14,6 @@
       ansible.builtin.include_vars:
         dir: "{{ cifmw_basedir }}/artifacts/parameters"
 
-    - name: Install oc
-      ansible.builtin.include_role:
-        name: cifmw.general.ci_setup
-        tasks_from: packages
-      vars:
-        cifmw_ci_setup_packages: []
-
-    - name: Log into openshift
-      ansible.builtin.shell:
-        cmd: |
-          oc login -u {{ cifmw_openshift_user }} -p {{ cifmw_openshift_password }} --insecure-skip-tls-verify {{ cifmw_openshift_api }}
-      register: cmd
-      retries: 10
-      delay: 10
-      until: cmd.rc == 0
-
     - name: Patch observabilityclient into openstackclient
       ansible.builtin.shell:
         cmd: |