From 415638242b98e78b16ba676010fc53e96febd04e Mon Sep 17 00:00:00 2001
From: Emma Foley <efoley@redhat.com>
Date: Fri, 9 Aug 2024 17:18:51 +0100
Subject: [PATCH] Try to use new hooks to run test playbooks directly

---
 ci/logging_tests_computes.yml |  6 +++---
 ci/run_playbooks_logging.yml  |  2 +-
 ci/vars-logging-test.yml      | 16 +++++++++++++---
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/ci/logging_tests_computes.yml b/ci/logging_tests_computes.yml
index 5b871eb7..723802c0 100644
--- a/ci/logging_tests_computes.yml
+++ b/ci/logging_tests_computes.yml
@@ -22,11 +22,11 @@
 
   tasks:
     - name: "Run file and container tests"
-      ansible.builtin.import_role: 
+      ansible.builtin.import_role:
         name: common
 
 
-- name: "Verify logging journalctl identifiers" 
+- name: "Verify logging journalctl identifiers"
   hosts: computes
   gather_facts: no
   vars:
@@ -36,6 +36,6 @@
       - nova_compute
 
   tasks:
-    - name: "Verify journalctl logging identifiers" 
+    - name: "Verify journalctl logging identifiers"
       ansible.builtin.import_role:
         name: telemetry_logging
diff --git a/ci/run_playbooks_logging.yml b/ci/run_playbooks_logging.yml
index 1e144f4f..35e0a0cb 100644
--- a/ci/run_playbooks_logging.yml
+++ b/ci/run_playbooks_logging.yml
@@ -52,6 +52,6 @@
             line: "{{ output2.stdout }}"
             path: "{{ logs_dir }}/ansible_run.log"
 
-    - name: Include report result 
+    - name: Include report result
       ansible.builtin.include_tasks:
         file: report_result.yml
diff --git a/ci/vars-logging-test.yml b/ci/vars-logging-test.yml
index 326f0ee5..4722bbab 100644
--- a/ci/vars-logging-test.yml
+++ b/ci/vars-logging-test.yml
@@ -1,5 +1,15 @@
 ---
-# temp: skip os-net-setup
-post_deploy_run_logging_functional_test:
-  source: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/run_playbooks_logging.yml"
+#post_deploy_run_logging_functional_test:
+#  source: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/run_playbooks_logging.yml"
+#  config_file: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/ansible.cfg"
+#  type: playbook
+post_deploy_fvt_logging_01_computes:
+   source: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/logging_tests_computes.yml"
+  config_file: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/ansible.cfg"
   type: playbook
+
+post_deploy_fvt_logging_00_local:
+   source: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/logging_tests_local.yml"
+  config_file: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/ansible.cfg"
+  type: playbook
+