From 3d10e4449c1bd67142e38b645e4f2c2196cc9fbe Mon Sep 17 00:00:00 2001
From: Chandan Kumar <raukadah@gmail.com>
Date: Tue, 9 Apr 2024 18:06:55 +0530
Subject: [PATCH] Move the tempest var to test_operator

https://github.com/openstack-k8s-operators/ci-framework/pull/1391
moves to test_operator role for running tempest tests.

It broke the existing vars based on tempest role. It also
needs to be migrated to test_operator.

Signed-off-by: Chandan Kumar <raukadah@gmail.com>
---
 zuul.d/projects.yaml | 55 ++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 6b9d80eb9..01b67dce8 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -6,39 +6,40 @@
     vars:
       cifmw_operator_build_golang_ct: "docker.io/library/golang:1.20"
       cifmw_operator_build_golang_alt_ct: "quay.rdoproject.org/openstack-k8s-operators/golang:1.20"
-      cifmw_tempest_tempestconf_profile:
-          overrides:
-            compute-feature-enabled.vnc_console: true
-            compute-feature-enabled.stable_rescue: true
-            compute_feature_enabled.hostname_fqdn_sanitization: true
-            # NOTE(alee) these tests will fail with barbican in the mix
-            # while cinder/nova is not configured to talk to barbican
-            # re-enable this when that support is added
-            compute-feature-enabled.attach_encrypted_volume: false
-            compute-feature-enabled.live_migration: true
-            compute-feature-enabled.block_migration_for_live_migration: true
-            # NOTE(gibi): This is a WA to force the publicURL as otherwise
-            # tempest gets configured with adminURL and that causes test
-            # instability.
-            identity.v3_endpoint_type: public
-      cifmw_tempest_tests_allowed:
+      cifmw_tempest_tempestconf_config:
+          # NOTE(alee) compute-feature-enabled.attach_encrypted_volume
+          # tests will fail with barbican in the mix
+          # while cinder/nova is not configured to talk to barbican
+          # re-enable this when that support is added
+          # NOTE(gibi): identity.v3_endpoint_type is a WA to force the
+          # publicURL as otherwise tempest gets configured with adminURL
+          # and that causes test instability.
+          overrides: |
+            compute-feature-enabled.vnc_console true
+            compute-feature-enabled.stable_rescue true
+            compute_feature_enabled.hostname_fqdn_sanitization true
+            compute-feature-enabled.attach_encrypted_volume false
+            compute-feature-enabled.live_migration true
+            compute-feature-enabled.block_migration_for_live_migration true
+            identity.v3_endpoint_type public
       # NOTE(gibi): enable only the high level scenario tests to keep the
       # job run time reasonable
-        - tempest.scenario
       # Plus an extra live migration test until we have cinder volumes / ceph
       # to run the live migration scenario tests with it
-        - tempest.api.compute.admin.test_live_migration.LiveAutoBlockMigrationV225Test
-      cifmw_tempest_tests_skipped:
+      cifmw_test_operator_tempest_include_list: |
+        tempest.scenario
+        tempest.api.compute.admin.test_live_migration.LiveAutoBlockMigrationV225Test
       # NOTE(gibi): there are no cinder backend enabled so test needing a
       # volumes needs to be skipped
-        - tempest.scenario.test_minimum_basic.TestMinimumBasicScenario
-        - test_shelve_volume_backed_instance
-        - tempest.scenario.test_stamp_pattern.TestStampPattern
-        - tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern
-        - tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_live_migration
-        - tempest.scenario.test_server_volume_attachment.TestServerVolumeAttachScenarioOldVersion
-        - tempest.scenario.test_server_volume_attachment.TestServerVolumeAttachmentScenario
-        - tempest.api.compute.admin.test_live_migration.LiveAutoBlockMigrationV225Test.test_live_block_migration_with_attached_volume
+      cifmw_test_operator_tempest_exclude_list: |
+        tempest.scenario.test_minimum_basic.TestMinimumBasicScenario
+        test_shelve_volume_backed_instance
+        tempest.scenario.test_stamp_pattern.TestStampPattern
+        tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern
+        tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_live_migration
+        tempest.scenario.test_server_volume_attachment.TestServerVolumeAttachScenarioOldVersion
+        tempest.scenario.test_server_volume_attachment.TestServerVolumeAttachmentScenario
+        tempest.api.compute.admin.test_live_migration.LiveAutoBlockMigrationV225Test.test_live_block_migration_with_attached_volume
       # We need to use a custom cpu model to allow live migrating between
       # slightly different computes coming from the node pool
       cifmw_edpm_deploy_nova_compute_extra_config: |