From e6721941aef9ef65dd5a9330334e040a395b07e1 Mon Sep 17 00:00:00 2001
From: Lukas Piwowarski <lpiwowar@redhat.com>
Date: Thu, 4 Apr 2024 11:00:33 -0400
Subject: [PATCH] [Test operator] Fix skiplist generation

The test_operator_cr is a copy of the cifmw_test_operator_tempest_config
therefore it does not contain a reference to the cifmw_test_operator_exclude_list
variable.

Because of that, we have to specify the value for excludeList directly
in the test_operator_cr.
---
 roles/test_operator/tasks/tempest-tests.yml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/roles/test_operator/tasks/tempest-tests.yml b/roles/test_operator/tasks/tempest-tests.yml
index 5657127f28..f6df44bd6a 100644
--- a/roles/test_operator/tasks/tempest-tests.yml
+++ b/roles/test_operator/tasks/tempest-tests.yml
@@ -34,7 +34,13 @@
 
     - name: Set variable
       ansible.builtin.set_fact:
-        cifmw_test_operator_tempest_include_list: "{{ list_allowed.allowed_tests | join('\n') }}"
+        test_operator_cr: >-
+          {{
+              test_operator_cr |
+              combine({'spec': {'tempestRun': { 'includeList':
+                      list_allowed.allowed_tests | join('\n')
+                      }}}, recursive=true)
+          }}
 
 - name: Configuring tests to be skipped via skiplist
   when: >
@@ -55,7 +61,13 @@
 
     - name: Set variable
       ansible.builtin.set_fact:
-        cifmw_test_operator_tempest_exclude_list: "{{ list_skipped.skipped_tests | join('\n') }}"
+        test_operator_cr: >-
+          {{
+              test_operator_cr |
+              combine({'spec': {'tempestRun': { 'excludeList':
+                      list_skipped.skipped_tests | join('\n')
+                      }}}, recursive=true)
+          }}
 
 - name: Ensure a secret for the cifmw private key file exists
   when: