From 462a91ef72e83a95b45c02091ad189f4ba9a0d10 Mon Sep 17 00:00:00 2001 From: Chandan Kumar Date: Wed, 3 Apr 2024 21:58:09 +0530 Subject: [PATCH] [EDPM]Switch to test_operator for running tempest tests Since most of the downstream jobs are using test_operator to run tempest. Let's enable the same it in upstream. It also updates the test_operator vars for periodic lines. Signed-off-by: Chandan Kumar --- scenarios/centos-9/edpm_periodic.yml | 6 +++--- scenarios/centos-9/multinode-ci.yml | 8 ++++++-- scenarios/reproducers/va-hci.yml | 1 + 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/scenarios/centos-9/edpm_periodic.yml b/scenarios/centos-9/edpm_periodic.yml index 020eecb7e7..16ef622e5a 100644 --- a/scenarios/centos-9/edpm_periodic.yml +++ b/scenarios/centos-9/edpm_periodic.yml @@ -9,6 +9,6 @@ cifmw_set_openstack_containers_namespace: "podified-master-centos9" cifmw_edpm_deploy_baremetal_update_os_containers: true cifmw_run_tests: true cifmw_edpm_deploy_registry_url: "{{ cifmw_set_openstack_containers_registry }}/{{ cifmw_set_openstack_containers_namespace }}" -cifmw_tempest_registry: "{{ cifmw_set_openstack_containers_registry }}" -cifmw_tempest_namespace: "{{ cifmw_set_openstack_containers_namespace }}" -cifmw_tempest_image_tag: "{{ cifmw_repo_setup_full_hash }}" +cifmw_test_operator_tempest_registry: "{{ cifmw_set_openstack_containers_registry }}" +cifmw_test_operator_tempest_namespace: "{{ cifmw_set_openstack_containers_namespace }}" +cifmw_test_operator_tempest_image_tag: "{{ cifmw_repo_setup_full_hash }}" diff --git a/scenarios/centos-9/multinode-ci.yml b/scenarios/centos-9/multinode-ci.yml index cf0dcbc243..c1cc8447cc 100644 --- a/scenarios/centos-9/multinode-ci.yml +++ b/scenarios/centos-9/multinode-ci.yml @@ -23,5 +23,9 @@ cifmw_install_yamls_vars: # Deploy EDPM in multinode scenario cifmw_deploy_edpm: true -cifmw_tempest_tests_allowed: - - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps + +# Tempest vars +cifmw_run_test_role: test_operator +cifmw_test_operator_tempest_tests_exclude_override_scenario: true +cifmw_test_operator_tempest_include_list: | + tempest.scenario.test_network_basic_ops.TestNetworkBasicOps diff --git a/scenarios/reproducers/va-hci.yml b/scenarios/reproducers/va-hci.yml index 376176dbdd..6f6849a01b 100644 --- a/scenarios/reproducers/va-hci.yml +++ b/scenarios/reproducers/va-hci.yml @@ -51,6 +51,7 @@ cifmw_run_tests: true cifmw_run_tempest: true cifmw_run_test_role: test_operator cifmw_test_operator_timeout: 7200 +cifmw_test_operator_tempest_tests_exclude_override_scenario: true cifmw_test_operator_tempest_include_list: | tempest.scenario.test_network_basic_ops.TestNetworkBasicOps