From dd369895945eccc72bc453272bdc855f387ebe19 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Wed, 29 Jan 2025 18:34:05 +0000 Subject: [PATCH 1/3] [ci] Add endpoint tests to the logging job The test checks for the various openstack endpoints that we expect to exist Co-authored-by: "Alex Yefimov " --- ci/logging_tests_controller.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/ci/logging_tests_controller.yml b/ci/logging_tests_controller.yml index fed478892..3c7e20606 100644 --- a/ci/logging_tests_controller.yml +++ b/ci/logging_tests_controller.yml @@ -23,6 +23,25 @@ - openshift - openstack-operators - openshift-logging + common_endpoint_test_id: "RHOSO-12682" + common_endpoint_list: + - [nova,compute,public] + - [nova,compute,internal] + - [placement,placement,public] + - [placement,placement,internal] + - [swift,object-store,public] + - [swift,object-store,internal] + - [cinderv3,volumev3,public] + - [cinderv3,volumev3,internal] + - [barbican,key-manager,public] + - [barbican,key-manager,internal] + - [keystone,identity,public] + - [keystone,identity,internal] + - [glance,image,public] + - [glance,image,internal] + - [neutron,network,public] + - [neutron,network,internal] + common_service_test_id: "RHOSO-12675" common_service_nspace: openshift-logging common_service_list: From a4973c2713dff392082cb8af98d2a24fbc0153ec Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Mon, 10 Feb 2025 20:54:50 +0000 Subject: [PATCH 2/3] [ci] Add vars/osp18_env to the logging playbook It contains the "openstack_cmd" var required for the endpoint tests --- ci/logging_tests_controller.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/logging_tests_controller.yml b/ci/logging_tests_controller.yml index 3c7e20606..a6a551948 100644 --- a/ci/logging_tests_controller.yml +++ b/ci/logging_tests_controller.yml @@ -6,6 +6,8 @@ environment: KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}" PATH: "{{ cifmw_path }}" + vars_files: + - vars/osp18_env.yml vars: common_pod_test_id: "RHOSO-12672" common_pod_status_str: "Running" From 47cd5637126c8c6c659a262836d95ab1ef9a0ad1 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Mon, 10 Feb 2025 21:00:39 +0000 Subject: [PATCH 3/3] [common] Add documentation and default for openstack_cmd --- roles/common/README.md | 3 ++- roles/common/defaults/main.yml | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 roles/common/defaults/main.yml diff --git a/roles/common/README.md b/roles/common/README.md index bbc725598..6a6c82425 100644 --- a/roles/common/README.md +++ b/roles/common/README.md @@ -58,7 +58,8 @@ For endpoint_tests.yml tasks: - polarion ID number for each test. common_endpoint_list - list of endpoints to validate - + openstack_cmd + - The command used to run openstack For project_tests.yml tasks: diff --git a/roles/common/defaults/main.yml b/roles/common/defaults/main.yml new file mode 100644 index 000000000..64f07b7a1 --- /dev/null +++ b/roles/common/defaults/main.yml @@ -0,0 +1,2 @@ +--- +openstack_cmd: "openstack"