From 1770652d0859278f649935d30c4c1625c3e2d70b Mon Sep 17 00:00:00 2001 From: Marihan Girgis <102027102+mgirgisf@users.noreply.github.com> Date: Fri, 7 Feb 2025 16:14:05 +0100 Subject: [PATCH 1/4] Add ceilometer_power_state to Metrics_verification test (#221) * Add test Ceilometer_power_state * Add the master_image to the zuul file * Add the master_image to the zuul file --- .zuul.yaml | 1 + .../tasks/verify_ceilometer_compute_metrics.yml | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.zuul.yaml b/.zuul.yaml index 8fc3dd5c..66101154 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -72,6 +72,7 @@ - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/vars-autoscaling.yml" - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/vars-metric-verification-test.yml" - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/vars-power-monitoring.yml" + - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/vars-use-master-containers.yml" roles: - zuul: github.com/openstack-k8s-operators/ci-framework required-projects: *required_projects diff --git a/roles/telemetry_verify_metrics/tasks/verify_ceilometer_compute_metrics.yml b/roles/telemetry_verify_metrics/tasks/verify_ceilometer_compute_metrics.yml index 98afcfc1..17a33fa6 100644 --- a/roles/telemetry_verify_metrics/tasks/verify_ceilometer_compute_metrics.yml +++ b/roles/telemetry_verify_metrics/tasks/verify_ceilometer_compute_metrics.yml @@ -52,7 +52,7 @@ failed_when: result.rc >= 1 - name: | - TEST Use openstack observabilityclient to verify ceilometer compute metrics are stored in prometheus + TEST Use openstack observabilityclient to verify ceilometer_cpu compute metrics are stored in prometheus RHOSO-1213 ansible.builtin.shell: | {{ openstack_cmd }} metric show ceilometer_cpu @@ -62,6 +62,17 @@ until: result.rc == 0 and "ceilometer_cpu" in result.stdout changed_when: false + #todo: Create Test Id in Polarian + - name: | + TEST Use openstack observabilityclient to verify ceilometer_power_state compute metrics are stored in prometheus + ansible.builtin.shell: | + {{ openstack_cmd }} metric show ceilometer_power_state + register: result + delay: 30 + retries: 10 + until: result.rc == 0 and "ceilometer_power_state" in result.stdout + changed_when: false + always: - name: Delete the server ansible.builtin.shell: | From 43a5abaa78421f7e3bf3f921ed428d45c3abc00c Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Tue, 11 Feb 2025 08:01:27 +0000 Subject: [PATCH 2/4] Add pod tests for Completed pods in the OpenStack namespace (#214) * [ci] Add logging tests: completed pods in openstack namespace * [ci] logging tests: update names for completed pods in openstack namespace * [ci] logging: update typo on pod name * [ci] Update pod list for completed status in openstack namespace This repo-setup-edpm-deployment-openstack-edpm-ipam doesn't need to be checked. --------- Co-authored-by: Alex Yefimov <126113326+ayefimov-1@users.noreply.github.com> --- ci/logging_tests_controller.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ci/logging_tests_controller.yml b/ci/logging_tests_controller.yml index a7adbb36..348db67f 100644 --- a/ci/logging_tests_controller.yml +++ b/ci/logging_tests_controller.yml @@ -143,7 +143,22 @@ common_pod_nspace: openstack common_pod_status_str: "Completed" common_pod_list: + - bootstrap-edpm-deployment-openstack-edpm-ipam + - configure-network-edpm-deployment-openstack-edpm-ipam + - configure-os-edpm-deployment-openstack-edpm-ipam + - download-cache-edpm-deployment-openstack-edpm-ipam + - install-certs-edpm-deployment-openstack-edpm-ipam + - install-os-edpm-deployment-openstack-edpm-ipam + - libvirt-edpm-deployment-openstack-edpm-ipam - logging-edpm-deployment-openstack-edpm-ipam + - neutron-metadata-edpm-deployment-openstack-edpm-ipam + - nova-edpm-deployment-openstack-edpm-ipam + - ovn-edpm-deployment-openstack-edpm-ipam + - reboot-os-edpm-deployment-openstack-edpm-ipam + - run-os-edpm-deployment-openstack-edpm-ipam + - ssh-known-hosts-edpm-deployment + - telemetry-edpm-deployment-openstack-edpm-ipam + - validate-network-edpm-deployment-openstack-edpm-ipam tasks: - name: "Run pods completed tests" ansible.builtin.import_role: From 956c524dc1b39eb8938f6a6f106f7490817cbc53 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Fri, 14 Feb 2025 16:14:56 +0000 Subject: [PATCH 3/4] [ci][logging] Add tests for services in the openstack namespace (#225) Co-authored-by: Alex Yefimov <126113326+ayefimov-1@users.noreply.github.com> --- ci/logging_tests_controller.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ci/logging_tests_controller.yml b/ci/logging_tests_controller.yml index 348db67f..fed47889 100644 --- a/ci/logging_tests_controller.yml +++ b/ci/logging_tests_controller.yml @@ -172,6 +172,13 @@ KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}" PATH: "{{ cifmw_path }}" vars: + common_service_test_id: "RHOSO-12749" + common_service_nspace: openstack + common_service_list: + - nova-internal + - nova-metadata-internal + - nova-novncproxy-cell1-public + - nova-public common_crd_test_id: "RHOSO-12670" common_crd_list: - alertingrules.loki.grafana.com @@ -179,6 +186,6 @@ - recordingrules.loki.grafana.com - rulerconfigs.loki.grafana.com tasks: - - name: "Run the crds tests" + - name: "Run Services and CRD tests" ansible.builtin.import_role: name: common From b240e82b321984db51c8ef7025be45c6803f03b6 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Fri, 14 Feb 2025 19:43:26 +0000 Subject: [PATCH 4/4] [ci] Add endpoint tests to the logging job (#220) * [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] Add vars/osp18_env to the logging playbook It contains the "openstack_cmd" var required for the endpoint tests * [common] Add documentation and default for openstack_cmd --- ci/logging_tests_controller.yml | 21 +++++++++++++++++++++ roles/common/README.md | 3 ++- roles/common/defaults/main.yml | 2 ++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 roles/common/defaults/main.yml diff --git a/ci/logging_tests_controller.yml b/ci/logging_tests_controller.yml index fed47889..a6a55194 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" @@ -23,6 +25,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: diff --git a/roles/common/README.md b/roles/common/README.md index bbc72559..6a6c8242 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 00000000..64f07b7a --- /dev/null +++ b/roles/common/defaults/main.yml @@ -0,0 +1,2 @@ +--- +openstack_cmd: "openstack"